diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 09:03:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 09:03:48 +0000 |
| commit | e2661b7f07b5ce5b4ff5bfcad0c2119cad520e6a (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 15c1ea4573902048537d131dcd814c9bc84dbb4a (diff) | |
| parent | c1a9dcb16819c25e1cbe4d30894a4b02de78ba5a (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8db9af6fb5 -s ours am: 6c794475b2 -s ours am: c898560bb2 -s ours" into rvc-qpr-dev-plus-aosp am: c1a9dcb168 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937069
Change-Id: I5089e8b691f1b01f2d4ec00a86179e50a6fce79d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions