diff options
author | Bill Yi <byi@google.com> | 2019-06-01 21:51:33 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 21:51:33 -0700 |
commit | 4ce9981fd4d9941fbcddae71a38a35bc369456d7 (patch) | |
tree | f9612031be23c2be4a4b92817f37d6d3050dbcbf /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 03e3ea94869eb533eaa7fbc0ec705c5de2980d21 (diff) | |
parent | b5b893485e793b2558db035b0f2ba35d454be7f6 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b3b93d72fb -s ours
am: b5b893485e -s ours
am skip reason: subject contains skip directive
Change-Id: I6582042ffcb84d3f9fb1f419c40483217d6d1075
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions