diff options
author | Bill Yi <byi@google.com> | 2019-06-19 23:45:40 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 23:45:40 -0700 |
commit | bd0f30ab958b5d55ed8532695f8520aa48d80986 (patch) | |
tree | f55a4e8b9f47ba950144ed2d9f191320dbf11040 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2952888902b39c2bdc239face207ccd793c11d9d (diff) | |
parent | e288f13f25527aad5ea4b64f5ff5aa4d410a8310 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: e288f13f25 -s ours
am skip reason: subject contains skip directive
Change-Id: I64687f029fe0c8a754e651b3d8a09353f74d8625
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions