diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 01:11:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 01:11:44 +0000 |
| commit | ccfb6a118e8e25f8849fa5caa946265c80621ae8 (patch) | |
| tree | 30cb3adda66717edf63ee8b63dbf588a64ffedf1 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c25b63c2755729c45f3e001102e0b15b99efecf8 (diff) | |
| parent | 725037d02aaf2fbb34c9cfb949511242163579c5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6fb53d53d4 -s ours am: 9d42ce687c -s ours am: 725037d02a -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519349
Change-Id: I317c3cc1778b1741247e200a95804f173021dd49
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions