diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-02 20:10:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 20:10:02 +0000 |
| commit | 117e1cbfaf85bd704b290c4b5cf9db53b713fa65 (patch) | |
| tree | f8c71a1ab76836590d81cdd4a6d0f6ce62fd0483 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 074859a77659399490f08c0864854bb4c36ea91e (diff) | |
| parent | 9097074afee73f11d45c9c0870c8a55ec3a3e016 (diff) | |
[automerger skipped] Merge "Keystore 2.0: Remove references to Keystore 1" am: 91ee4158dc am: 2317d67072 am: 9097074afe -s ours
am skip reason: skip tag Change-Id I100c8d536241ac6ba7a99b1c2dfaf2930decd387 with SHA-1 8e21a023e2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663081
Change-Id: I7acd8f91a003de114656256fce56e4e449764677
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions