diff options
| author | Benjamin Franz <bfranz@google.com> | 2021-01-12 16:48:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-12 16:48:26 +0000 |
| commit | a633741730608cc72d297d6eaf83611ca303222a (patch) | |
| tree | cd62f1f28b9fe054f020f6930daa3a25202b5aca /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | eedea4c824cd218b8df244ead4ee1ccc44ac100d (diff) | |
| parent | 9f7867cee2875351c9f4efa44ae4892f72158e84 (diff) | |
Merge "Add new overridable annotation to platform compat" am: 458515e464 am: 899cd8920b am: 9f7867cee2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540124
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If74ec1464e1a52a14ab1aeb81ca676622a52a72d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions