de8097ec8d6856a156757e4e7c76f23e90a2cbaa
8c99359559 -s ours am: 6725c98e08 -s ours
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13724899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I093ad671768d6020662496dbfc866cab6ba384cb
Merge "Identity Credential: API changes for Android 12" am:
40d6635701 am: 6252f82f61 am: 581bf34de0
Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am:
6a6a6349a7 am: 029885f8c7 am: 768da4ffc0
…
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%