d4bcdb9668310ff04f5da1630c492542c0b4d679
752aee7e04 am: ce702151e8 am: a4c042dc10 -s ours
am skip reason: Change-Id I81675429d73486f0b002e76acabaa4883990ab11 with SHA-1 bd03c96317 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595291
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6cc07fb0481fa2a4587d6ed165a0e36bdfad921
…
Merge "Identity Credential: API changes for Android 12" am:
40d6635701 am: 6252f82f61 am: 581bf34de0
Merge "Keystore 2.0: Add keystore engine grant string convenience functions." am:
4da629d9be am: 7e74123b72 am: 6776c214d2
…
…
Merge "Stop ignoring classes on the classpath for stubs" am:
61e082abdb am: ab3f2d3aba am: 81bfcb40a3
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%