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