9520ff93711dd18de5114da9959e5cd444040d54
cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad25 am: ff642c408c -s ours am: 80b4e4de4c -s ours am: 847b1d7cba -s ours am: ad7b480720 -s ours
am skip reason: Change-Id I4b3affce57ba61ad9697e91f2a5f63556ee1cd62 with SHA-1 5b0078defd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374724
Change-Id: Ib012be89f3b6c05341f55bc94b41b1d75cb6c1c9
Merge "resolve merge conflicts of
c94e810cab to rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: a3d8ee34a4 am: 8d592fae4e am: e96992ff61
…
Merge "Merge "Convert lowpan/tests/Android.mk file to Android.bp" am:
9d9510e39e am: f7c86b4982 am: 152348379d" into rvc-d1-dev-plus-aosp am: acbfaa44ab am: e84805febd
…
Merge "Remove libandroid_trace" am:
242c212b80 am: 7d36816ecd am: 7e2c27581a am: bcd3b9c997 am: 2adaf74b30
…
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 "Update language to comply with Android's inclusive language guidance" am:
a005cb30ed am: 3772a5b3fd
Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am:
0b778939c7 am: 3f1247e91b am: 7d95615a4d am: 5f1edaf743 am: 3371e64939
…
Merge "Integrate system language filtering functionality" am:
2df94f9b15 am: db00e424d9 am: 654ed1df03 am: 2f5ddb2fc6 am: 1048aa0326
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%