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