diff options
| author | Bill Yi <byi@google.com> | 2019-08-08 19:08:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-08 19:08:33 -0700 |
| commit | 63ac55dc17c0c43dd88b10400b6af269b49d03ea (patch) | |
| tree | 6f17c97ad073fa16f4fcca76e3b4c5fa290635bc /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 53c35e9b2dc8df2d91da9692e6d757109d3a12dc (diff) | |
| parent | 6db6f37674ff722cb8158b9b9af545556b745ab8 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 801d177995 -s ours am: b87c62f388 -s ours am: 585f5f228c -s ours
am: 6db6f37674 -s ours
am skip reason: subject contains skip directive
Change-Id: I9bbd61ecd1577161fc446c2f00205a545d4fd8a1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions