diff options
| author | Xin Li <delphij@google.com> | 2020-09-01 20:37:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-01 20:37:03 +0000 |
| commit | 4467c2f6ecdbb3a1bac085d16693f45e8443fa51 (patch) | |
| tree | 03ed9c82ebb8df725a6a813f592ab6f3889349e0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9760c427841f2e3ce65563607527d8e5dc569fde (diff) | |
| parent | ff2ffe48acb657c959cae265529a7290013c7db8 (diff) | |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850
Change-Id: I6fee791ed4a4939ab3f24b66f779a20124d0c63d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions