diff options
| author | Makoto Onuki <omakoto@google.com> | 2020-06-23 22:10:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 22:10:55 +0000 |
| commit | 1f725fd56124acac72330440cc21f2beb2d840c8 (patch) | |
| tree | 7908e94b9a3665268ee693900a473e3334701114 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 21b38545cc95600f2acca8c245aa415054af080e (diff) | |
| parent | d10d8981b1141459149db07160f72c3aeaec9136 (diff) | |
[automerger skipped] Merge "Don't add API annotations in the internal R.java" am: 0ad81868da am: e7105c397b -s ours am: d10d8981b1 -s ours
am skip reason: Change-Id I613e8611ddaf5f8e4761d351d4cd0142d59c7cc9 with SHA-1 de6e6f2098 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1347423
Change-Id: I8ed42dea534f8552c9622f6e82d27e85db7b969b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions