diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-06 06:57:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-06 06:57:50 +0000 |
| commit | b42e36fd2374e4dd881c0a9758001038e0331877 (patch) | |
| tree | b63faa781e9e2b81bf85397d63d9eda3419d7cb4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ed423ba9819fa4215dcc6d985949e104a9b1f2b0 (diff) | |
| parent | d038ee8e1e901fe76f6c4bbfc6eb8374f90f2b5e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 16381c8fd5 -s ours am: c65ae4deef -s ours am: d038ee8e1e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769370
Change-Id: I40588a9158649b88209bd346c2c23168d9e399b7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions