diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-20 01:00:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-20 01:00:21 +0000 |
| commit | 8de2028f3e97d142bcfbf0d530da41f36b8a7f91 (patch) | |
| tree | 4d96761858006173069943d4f9c48da7ca19a0a8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e63c9ef65070f6e13ee029cd7e2b7968020c3853 (diff) | |
| parent | 3e7bf98931d71e28f6cfee41ca6d9743f07e3cbf (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f1fa550975 -s ours am: 5dfd565fa3 -s ours am: 3e7bf98931 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12409744
Change-Id: I3dc943a859c0482ac29df2ce87a55704b9d1ba0f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions