diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 07:07:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 07:07:18 +0000 |
| commit | 1af04e992a9a2e1a5803e86f48064dd48f85a3a8 (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | aff52cec2c74f4b711b7d9ea128ad5956526ba5f (diff) | |
| parent | fdeaf2e1e83d3120e35976ed178a9fb7c7e15ff7 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ccc5fc672a -s ours am: 6a12a6c11a -s ours am: fdeaf2e1e8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12076171
Change-Id: I7e14fd1d8eaac37df937fa0bf09fdba21ae325d0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions