diff options
author | Bill Yi <byi@google.com> | 2019-09-14 13:48:40 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-14 13:48:40 -0700 |
commit | e513d5488b95c41674deeb155fc4d510a7aeee84 (patch) | |
tree | 4f353bb923090ed00ed05a8938185d27a6526679 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7aee9fbbf69f040455b8f37c53d5f3309ac9dace (diff) | |
parent | 4b279cd14903e9707b331fc2680e1fd61df0a2c7 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 7350ab115a -s ours
am: 4b279cd149 -s ours
am skip reason: subject contains skip directive
Change-Id: Id65e68e8e663dce961e8ef370a8a915fa777ee81
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions