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