diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-06 01:52:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 01:52:47 +0000 |
| commit | 5bdd02628d4c3a729c7be9a1cf180f36174ad15e (patch) | |
| tree | 78bf650c1e47e98f495806951d413d23694ea454 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d6852434c21fd24d9a65801d433a395711dd50b8 (diff) | |
| parent | ca6272cf1e02255298aa39a1f405f19ea37c8c22 (diff) | |
Merge "Keystore 2.0: Android Protected Confirmation" am: 30841f177c am: 3443d2b671 am: ca6272cf1e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508897
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9bb924273fb712efb270e8afbe194604ce1f90ce
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions