diff options
| author | Makoto Onuki <omakoto@google.com> | 2020-06-23 21:59:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 21:59:39 +0000 |
| commit | d10d8981b1141459149db07160f72c3aeaec9136 (patch) | |
| tree | 6983f3e8337d27d65f4d062ef4e27732302bd917 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a05d793f1a4fca00775a451decf675bf7bae5d6d (diff) | |
| parent | e7105c397bef9528123de25129d5406a20f1b900 (diff) | |
[automerger skipped] Merge "Don't add API annotations in the internal R.java" am: 0ad81868da am: e7105c397b -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: I3f584160d4cbd77ae93ca898161b8bd8da8c1a53
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions