d3cfb31078f84c7140adc8c7fa256c2f054e0782
cc318221a5 am: 9c4102e2a1 am: b50587319e -s ours
am skip reason: Change-Id Ie31d32a08b10b8c125f27832e81a3e65b6d8767a with SHA-1 e177c09787 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3effe377205a2a1b37eceb2ec978af31d98f23f
…
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
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%