diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-21 23:05:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-21 23:05:10 +0000 |
commit | 10cb38987863f5aac5ba91687aab851f98a93b50 (patch) | |
tree | 28634386a64fcc8f1ee6cc4efcfdef2139ec86b3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f5612df16ee53504b1473166aaa4915a350f29bf (diff) | |
parent | ca9ccd787ae8f3dd479b01c634398fe7a2155ac7 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 68755307c0 -s ours am: ca9ccd787a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12424091
Change-Id: I60dd4354671383756e099f39e1305af362e619dc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions