diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 11:06:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 11:06:58 +0000 |
commit | 063bbf47b179c6f1065e989271d1dc5e485ac533 (patch) | |
tree | 72b8f27d696d5876b6de253855550fae26081645 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2ac02b6131aa6f4e4d2149ef6e5ab188e69b75f7 (diff) | |
parent | ef1ecf62d53fc9bca8e01d7eac8b5ebcfbe94bad (diff) |
Merge changes from topic "am-cb21d9627e334118b18655797a8d36c3" into rvc-d1-dev-plus-aosp am: 029f8edd2e am: ef1ecf62d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079
Change-Id: I82abdd93e6657f72580c3b4a6963436d38a231d6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions