diff options
| author | Bill Yi <byi@google.com> | 2019-07-31 16:14:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-31 16:14:06 -0700 |
| commit | 905910c9f8172b27d82aea7ced04c3eb1a73b63f (patch) | |
| tree | 5adb8cf781f726e7206e8e29befdc53579f098d7 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 5a56fc3676b07b6e63903eb91d485e91fb80dac0 (diff) | |
| parent | b24cf8061c51c9e44941c799b61fc6a01dcb439c (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: de521e7d3d -s ours am: 23ae47a8d7 -s ours
am: b24cf8061c -s ours
am skip reason: subject contains skip directive
Change-Id: I5ded01a9d31b7f6343cca0abe2db729d42a716f5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions