diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 00:52:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 00:52:31 +0000 |
| commit | 0d1862915c3112bd2f67fe6c237f9636631d6f56 (patch) | |
| tree | e5c82d73eb5502f15d727cd3f8686c35e7a54907 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4c011120a7bbe042c4aa7874ac17d98f1f7f0cbb (diff) | |
| parent | 349f5d3fda70ca39132021cb91e7f9cc537361f8 (diff) | |
[automerger skipped] Merge changes from topic "am-0ff8881e2ca547c2bdb9e06a7ca70417" into rvc-qpr-dev-plus-aosp am: 349f5d3fda -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986657
Change-Id: Iad52c7daae8b3fbcb28f86b9ea44af998df2d8c9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions