diff options
| author | Makoto Onuki <omakoto@google.com> | 2020-06-23 22:36:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 22:36:10 +0000 |
| commit | b5138794f80d77d852a68fa7858e90c2ab356655 (patch) | |
| tree | 497dc4b2aba7e0108b30b5b0d59e1aca1f582972 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1e2625e95004a706a562956f6b4673cd9a5a1f75 (diff) | |
| parent | 856c1510d0cb9425a022761b6b2ee2477e151158 (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: 1f725fd561 -s ours am: 856c1510d0 -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: I3eb28d58af44226f367b7586ca231cfe673c0947
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions