diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 06:38:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 06:38:44 +0000 |
commit | 5530f0926918dbbe7c7500f71425273022ab072b (patch) | |
tree | c43b959ebcbe451da1190f98d4d90e0d35e58932 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b55d292da6cd502d84a47f25ce161779875914ad (diff) | |
parent | e012e327c7344655e1d61573f1d88f4ab7d2a39e (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e012e327c7 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420005
Change-Id: I76ab5b52796e0dbf51611db3607666686648399f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions