88d33ffa2c39e43bf9c290f535ac10ea545816d0
Bug: 164201104 Test: Manual Change-Id: Icfaaf661d7dd89a2e746dcfefb44731c275dcb06
Merge "resolve merge conflicts of
c94e810cab to rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: a3d8ee34a4 am: 8d592fae4e am: e96992ff61
Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am:
4ec7604b48 am: ab5d157062 am: 2db2e500ee am: c7b8432e5a am: ff5bde9751
…
…
…
…
…
Merge "Use jni_headers instead of JNI_H_INCLUDE" am:
75a5b44258 am: b842272135 am: 61ea9dd847 am: fe576af25a am: b90a8a87d9
Merge "Add sample app for haptic assessment." into rvc-dev am:
d121fd282c am: 7afc791190 am: a06cdd86e4 am: 37a3b83c1d
…
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%