diff options
author | Bill Yi <byi@google.com> | 2019-06-01 07:59:44 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 07:59:44 -0700 |
commit | fa09b59f61bb3d913c8a1e0042ef44d78d954b6f (patch) | |
tree | 50f7b1b86f8f9f27ea337e8df43fe3961eaf18e6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1a27afa3017cbdafd5140a5ec534c645b5885498 (diff) | |
parent | d6d42f4be1c5ea9fa542b61ca20f2cf90fda0215 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d6d42f4be1 -s ours
am skip reason: subject contains skip directive
Change-Id: I3b89e3143774ca5c2030987437610f3b280b70c3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions