71f07b4ed5be490508fe4453f4fccb903689f8aa
f0bd7906d0 -s ours am: 0492435ea2 -s ours
am skip reason: Change-Id Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037 with SHA-1 3f74b33211 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13692967
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e46fa035a8cb540396df36fbd5995251b8ee98e
…
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%