f60667b546760db1cd7b6311761a5df8152eb330
5d2176df69 am: 8feea3a186 -s ours am: 9666473f16 -s ours am: 4c5f8e9ac4 -s ours
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343385
Change-Id: Ifdb284f97261593cf05f4ea565bdd24e565f02f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
Merge "identity: Add clarifications to newly added API." am:
ad3097312c am: e502cbe5db am: b8621b3097 am: da1715a6b5
Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am:
b8ebf69571 am: 2e64dda571 am: 289609bdb3
…
…
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
…
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%