diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:18:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 06:18:05 +0000 |
| commit | 25fa2774da3a78df692c1bc1f675581d9c20aee0 (patch) | |
| tree | a9e0e5c34fc13bdb78058927ec24249545b8a06a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 702828011222c823dd003c46056be95dc1a63b4c (diff) | |
| parent | ec77727576787413c40ae6b024eb293efc65e9b7 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: bcec292d51 -s ours am: fb226f5848 -s ours" into rvc-d1-dev-plus-aosp am: 31f05766be -s ours am: ec77727576 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860178
Change-Id: I11b03a3334691424a76be01f74ad9f9e970cd95c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions