diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 18:25:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 18:25:18 +0000 |
| commit | beaef5d8aedd3517d8f24196557bd1885ff8a305 (patch) | |
| tree | f6e26618ccadc5bd488d26de9acced7fa9f4f97e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b4adf2c24bab1c4e8470a86b085d746e17f5483f (diff) | |
| parent | ff1285a222b0d39ecbb9a945276166c1ae6c97f2 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ab2b90ef34 -s ours am: 0baaa00ffb -s ours am: 3688c865bd -s ours am: ff1285a222 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11904325
Change-Id: I4cfd0d0887581ad61bb27550badc5eff4dc2999f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions