diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 21:04:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 21:04:11 +0000 |
commit | f72f7dfa87a042782ca743dcce71246d0b36bc7a (patch) | |
tree | 73034d87dd16128525138a4b0cb05ea972b6bddb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a2d4ebc0d6aaadfa4c03c2c6cfc3ec0d11c7b263 (diff) | |
parent | a7afeea7b65e8fb646254f24d057719b18d164ea (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a7afeea7b6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988027
Change-Id: I3a274394040ee969ca20fe53cd9148b346eb0976
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions