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