diff options
author | Makoto Onuki <omakoto@google.com> | 2020-06-24 22:44:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 22:44:01 +0000 |
commit | 5e39e8835afeaa30f3876bdd3b35c5042f651211 (patch) | |
tree | 2e1407b915ba87b8103a40584d2eb15a0c80308e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3a9c937f4f0b419ddcfafe3eb5a9419984339cd3 (diff) | |
parent | 2ff58ac90a31f2d8f384f60b2864626f84ecd40f (diff) |
[automerger skipped] Merge "Remove unnecessarily @System/TestApi annotations" am: 79c47faf99 am: 2ff58ac90a -s ours
am skip reason: Change-Id Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2 with SHA-1 42bec243c0 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1349284
Change-Id: Iadba5801aa325100c0e8e482a529cbd7606ec2e0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions