diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-17 04:50:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-17 04:50:16 +0000 |
| commit | 1dddd0eab0b2731793faa8717ae4ba5f08abed28 (patch) | |
| tree | 4be95f617ba8a9bed8b3f4a3dca9c2a057533209 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | afb3acf1009dcc13c0bce027b7b9c4e29ab10fb4 (diff) | |
| parent | 22da50958f3836f8a20e282dc9b0f125d3538116 (diff) | |
[automerger skipped] Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp am: 149ef2b6c6 -s ours am: 22da50958f -s ours
am skip reason: Change-Id I7d98ab425852ffa064c68f5dc50bd1f5a4a49ab9 with SHA-1 472144c35a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028
Change-Id: I8d7e1601bb3d0943d0da103e1568cb31e5129ef4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions