diff options
| author | Rubin Xu <rubinxu@google.com> | 2020-07-17 09:01:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-17 09:01:18 +0000 |
| commit | 5f7b19c7aa332c2307176e8d8fdcab9f10accc59 (patch) | |
| tree | de9a72680df48442f068cd6354fb650df4643ae8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ef48aef3ac75b4383e23c98a5b41b6305e553f6f (diff) | |
| parent | 294cbeed69da03579c855414eec05978686067ae (diff) | |
[automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a40 am: 294cbeed69 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580
Change-Id: I15979ecd70a91d4eeb549524bb2339584cfbe7b3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions