diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 22:18:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:18:05 +0000 |
| commit | d40752bff239c73e308e7876893dc2958ad3cf3a (patch) | |
| tree | e1fd5c9113c23e3dfe3dd13a402374634a65a958 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 29131a4cd5c76adeb8ffc0358be21fe6263722e6 (diff) | |
| parent | f48b7d2e9b4a039e603dab04a6e19108fcd61ebd (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0df49ee1c -s ours am: f48b7d2e9b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13170965
Change-Id: I62bfff2e06e4bb1799af3cf3a3d5e69cf7fefe3f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions