diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-29 09:16:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 09:16:52 +0000 |
| commit | fe3c226334678a334e541a03821461b074981fb9 (patch) | |
| tree | a9859c2d319146bbdfac08e90e468347981a74ad /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c1d05b2eac195ae41444e011f99e48fcbc94e671 (diff) | |
| parent | c80605e0ae76c32710b462e6c8464cab3aabe071 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64aef342c9 -s ours am: 399db8211a -s ours am: 45ef6e224f -s ours am: c80605e0ae -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12026906
Change-Id: I28edd72b8ee9eacfb43a85051e84c568d8ab7a67
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions