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