diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 15:46:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 15:46:52 +0000 |
| commit | 77173da055c30ca87dbf7f6498216f5258ae1e3f (patch) | |
| tree | f36d3e8586de3dc5d34d4ebada1e15e2e16340ff /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 636ef68252561afbf2f3573ca045d47510bc66a8 (diff) | |
| parent | 58b6450671a280dfa5ed2359fea9feedf1803519 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64ab1a4fb2 -s ours am: 68f5622b33 -s ours am: 14502613fe -s ours" into rvc-qpr-dev-plus-aosp am: 58b6450671 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038945
Change-Id: I1ca6826ea6af9a73d6d1adfbe117a111dc2104bb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions