diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 20:22:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 20:22:59 +0000 |
| commit | e18a6f61b1ff0ba4f54bef97e2d207f3b341fcca (patch) | |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 42bc2d96532681b7118dbcb0de3ba34b1d58ea01 (diff) | |
| parent | e908f88308d6e39a7418060e52a32edb257a716b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours am: e908f88308 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684410
Change-Id: I08348f0bef425e1dfc89181a752ed2d5f2e30d8d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions