diff options
| author | Baligh Uddin <baligh@google.com> | 2021-05-04 23:29:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-04 23:29:17 +0000 |
| commit | 7bb2ad33e474c5e70a737981ee79649adab44e60 (patch) | |
| tree | bcdc28778d6292e3177d3641c68e9d379caf75fb /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | affd693c7db89caa000dee8d6f25fa78e2715750 (diff) | |
| parent | 1ae88c4be8d1b0a23bcc678316cea582292044ec (diff) | |
[automerger skipped] Merge "Remove annotations that have been relocated" am: 7a622ea7eb -s ours am: 1ae88c4be8 -s ours
am skip reason: Merged-In I024252070bd806d50d54377190fdc5cd5b4445e1 with SHA-1 bda79da64b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692855
Change-Id: Ic68caa5e4f99ad6af4d1c3a7a936c1d36c2ffac0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions