f2cf13afefc01f07a514610a2897bbab93c4c296
49c52755d2 am: befa7e20f7 am: 9e07e38369 am: a9d806ec0b am: b0591f4068
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398233 Change-Id: I6ba64f2253653c7c25ac7407fb0cfed4b3dee577
Merge "resolve merge conflicts of
c94e810cab to rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: a3d8ee34a4 am: 8d592fae4e am: e96992ff61
Merge changes I05b83c47,I5a840ec1 am:
49c52755d2 am: befa7e20f7 am: 9e07e38369 am: a9d806ec0b am: b0591f4068
Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am:
4ec7604b48 am: ab5d157062 am: 2db2e500ee am: c7b8432e5a am: ff5bde9751
…
…
…
…
…
…
…
…
…
…
…
…
Merge changes I05b83c47,I5a840ec1 am:
49c52755d2 am: befa7e20f7 am: 9e07e38369 am: a9d806ec0b am: b0591f4068
Merge changes from topic "art-owners-update" am:
6066f5dae1 am: 74ad7baf85 am: 11f0a179d7 am: 03c7f1ce80 am: 7c7fe31e82
Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am:
0b778939c7 am: 3f1247e91b am: 7d95615a4d am: 5f1edaf743 am: 3371e64939
Merge "Update language to comply with Android's inclusive language guidance" am:
a5d1ef9837 am: 51ded68601 am: 9b0cd12ce4 am: cb6b00197d am: 2bc333e497
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%