diff options
author | Bill Yi <byi@google.com> | 2019-09-10 09:26:25 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-10 09:26:25 -0700 |
commit | 4617a582a7155a1c3e3c30dafb4e3d0314b4e597 (patch) | |
tree | acc5b4ed5a5eeae4072f6a227f2ce7ee93b84d4a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ed511cde166aaeebf7e2d6947a54f853221e4b66 (diff) | |
parent | 8de7a1b8887a00e797db8739cb93622eeab5ff4b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c7bc6811ee -s ours
am: 8de7a1b888 -s ours
am skip reason: subject contains skip directive
Change-Id: I663aed2c84134cd5a2c52020c9b4e79eb8623873
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions