diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-04 12:25:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 12:25:55 +0000 |
| commit | 9e6d41077109cd7178382e2d45377a6f8cdb46e4 (patch) | |
| tree | d3000bfb4d4c4f04b6817c49135379cfcc57c02e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1077363dca78cad7c8dfba9c1f43ac3a0f6d39c8 (diff) | |
| parent | 8cd7fddc4af8a4e4fdd0851840271b1f2b7cf6c6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d0815d1cff -s ours am: 8cd7fddc4a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13165143
Change-Id: I6932b145708398581fce8c284449887a5efccacc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions