diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 07:02:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 07:02:48 +0000 |
| commit | eb467b5323cc524484f87e80a72c7e4535afccbd (patch) | |
| tree | ac790e097d5d1c43ab2ff44f09a5fa48748c6c51 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5b3feb38c647ce719e5e64e42b8919633e9dac4b (diff) | |
| parent | 135e36a20fe3ddb9e7203c0fd12409fcbaae29b4 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours am: e4a4b7dbee -s ours" into rvc-d1-dev-plus-aosp am: 3e14f4892e -s ours am: 135e36a20f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12184422
Change-Id: I7160e1e91c5da239ca00b20c17fa70e50a3596df
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions