diff options
author | Xin Li <delphij@google.com> | 2021-03-03 22:35:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 22:35:44 +0000 |
commit | 065dbb1c6bf598583bed45090d6d1cc14a22c3ea (patch) | |
tree | 4a40de3ab56e53511cca4b5da843de96dad1e693 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | df5a88ea6d815b3e8567f4f23d2dcfea50ec6da3 (diff) | |
parent | 1af6a12e98c9b2c5317b35ebe2d8c8d269e98dce (diff) |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 1af6a12e98 -s ours
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05ab53a6a483b8e4dbe40afe6dab40e2b7d328ea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions