diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-11-30 15:05:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-30 15:05:12 +0000 |
| commit | 5b2994793a9fa3dd4afdc17855b3a1fa5ae5a46b (patch) | |
| tree | f71fb12c3828ec90fad7facfde0313faa863656e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 02a0d9eeb257bb87b3f305d26217efc443b7e673 (diff) | |
| parent | 21752ade7fed11211137cdf8a2d97e9a27f39618 (diff) | |
[automerger skipped] Merge "Keystore 2.0 SPI: Make LockSettingsService tolerate the Keystore 2.0 SPI" am: c954cae54b am: 3875aac04b am: 21752ade7f -s ours
am skip reason: Change-Id I6e92a08a6b3145891585a134c195c4e29be709b5 with SHA-1 b9e7ae352b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471566
Change-Id: I09c8f8fb2b4280a682e96f0c780e12c61404392a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions