diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:59:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:59:00 +0000 |
| commit | 20575d9e45adc99c40fe55cbf5b23c263e219ed2 (patch) | |
| tree | ba6c3bc9147c41b0b3d62f48824d83f5832ad5cc /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 397f0caa173ccbc10406303a3a2b783e3b807667 (diff) | |
| parent | db8b134510567972d4a8f68598529ae84f095085 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4f9abbfb58 -s ours am: 5f470bae4a -s ours am: db8b134510 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519377
Change-Id: I895e3618ae88318a437aa9465dbcbd2b2e1922f7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions