diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-06 00:26:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-06 00:26:36 +0000 |
| commit | a101bcf323aa7e7c400d639308daebb67228a781 (patch) | |
| tree | c248b56d5343b172fb03447a8db63a221882dab8 /tools/aapt2/java/AnnotationProcessor_test.cpp | |
| parent | 3758b4b1ce4ca01dfc2223c34a28edc03bbb4aa7 (diff) | |
| parent | f01b99332b4d111b69e08a16e2544877ed30320c (diff) | |
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 2fe22290f9 am: f01b99332b -s ours
am skip reason: subject contains skip directive
Change-Id: I25e889bad69a7a3bfd819e7a75a69a16f29b92da
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions