diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-17 09:19:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-17 09:19:25 +0000 |
| commit | e260ebd9af5640eb580ab72cc8eb2f19032ebeda (patch) | |
| tree | f9d7a251bba6b08c016e334d66574a00f364ac57 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ef69c1a670aa6f00d81778e81fe8e437de112bde (diff) | |
| parent | 0cb2bb830c4d3c7282c19119e3013a4e6c62c7d8 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2c2 am: 70b6c13294 -s ours am: 0cb2bb830c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580
Change-Id: I9ccbfe52c2bdcec25331bb20b8231a73a75dfc6f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions