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