diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-19 23:09:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-19 23:09:45 +0000 |
| commit | eaaa9dd36e9a6bfd0246bc56a342c986db47e136 (patch) | |
| tree | f216221affe35a8dc792d83ac2cb6f2fbe98fcc6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6fabe93b731cd76d9ca78a756eec0bfa96e068aa (diff) | |
| parent | 3cea47c7819f009f23aeb0a96893fe837bff183b (diff) | |
[automerger skipped] Merge "Fix usage of annotations in TetheringLib" am: 91bb789c20 am: a4dbd9a897 am: 3cea47c781 -s ours
am skip reason: Change-Id I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd with SHA-1 eb22daaf5b is in history
Change-Id: Ifdfeae4e43afd3892ced4964d54e532a1f46e8fc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions