diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:32:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:32:58 +0000 |
| commit | 8d51416cfeada8f19bc20461151eee8cef5cec7e (patch) | |
| tree | c5591c8585bb5401e40c6b35a7896599ebd6bd7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fdf63fd353c3d9ebe83b3901386ad22f2b9de8a7 (diff) | |
| parent | 099e2ee61451b3f3fbbc99a5dca74689235c016f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3b1822849c -s ours am: 87d0d2ef75 -s ours am: c47366fe16 -s ours am: 099e2ee614 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937075
Change-Id: Iaa5b81e7d354233683186ac20322ec5da9b8a602
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions