diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 23:22:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 23:22:16 +0000 |
| commit | 7195c2b846f7f4ab75ba6baee5cb535712a742fd (patch) | |
| tree | 51c8aa52b8396d3e04ba94f643bdc2fad917643b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6ee20759a5e7239b0f2e946d9de891bd2684e920 (diff) | |
| parent | dc8bec3944aec829555fa18582206f92540bc8a7 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cd259caf54 -s ours am: fa42ef82ca -s ours am: b3b360a661 -s ours" into rvc-qpr-dev-plus-aosp am: dc8bec3944 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11809238
Change-Id: I09b35391132771c16efa4788448e1ed97cbc30e7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions