diff options
author | Paul Duffin <paulduffin@google.com> | 2020-05-27 07:02:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 07:02:15 +0000 |
commit | 653fe0f295bc7195b47b34ec96c91883ce4e6c57 (patch) | |
tree | d0d2e316160f0b8e82061e6c245eabf7560beff8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7c18024dfa67c04ed63bc60ca51e602db0ba1083 (diff) | |
parent | 45654cc7a6c12d6ba3c78f1a057104992e0e9a69 (diff) |
[automerger skipped] Merge "Use tags to access conscrypt sources" into rvc-dev am: 45654cc7a6 -s ours
am skip reason: Change-Id I93dfb8bfac60bd7ab628292667c8d7a9d5e8eb82 with SHA-1 e55d4e3b62 is in history
Change-Id: I76186d92eda3faef9fd0ef6b4d0d97932b398284
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions