diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-09 19:53:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 19:53:45 +0000 |
commit | 69c8cc1cdf00860bcc7f0ddf6722e1fd1ffa49f0 (patch) | |
tree | 326966927d87926227a94fcd6c7690d395f124fe /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 844cd81788cd5f0b4c75bec334f62c4f14ab1c9f (diff) | |
parent | c2e682760b383f72ac661a43ae75c6800c5b7fad (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0811c47412 -s ours am: ede58b18fa -s ours am: 2bdbac1354 -s ours am: c2e682760b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118648
Change-Id: I968ce16cbc20d8b4d630acb31ddc3c3e82cc6241
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions