fe138c84ea7e696731dd7dd493087351288263de
589c1ad6ba -s ours am: 6b07a0afce -s ours
am skip reason: Merged-In I26dfc53b22817953839d9882398a502ea7293c08 with SHA-1 26aff6fbcb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17410817
Change-Id: Ic73eed7cb40f5a9fcb908d595bfac56b90314389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
…
…
…
…
…
Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am:
b8ebf69571 am: 2e64dda571 am: 289609bdb3
…
…
…
…
…
…
…
…
…
…
Merge "Do not resolve port index for apps not targeting SDK T and beyond" into tm-dev am:
523145c415
…
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%