diff options
author | Bill Yi <byi@google.com> | 2017-09-26 18:51:35 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-26 18:51:35 +0000 |
commit | c3bae5c8b76dd2ed9d20719f62d43555250820f2 (patch) | |
tree | d4bfa8e106734b74beebbd3b976e663c6425d67b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2cdb576a5a15ee9cb8d2c6f001fcc493c64c188e (diff) | |
parent | 3ebe42353b25bf9907a4ad6aeb839d63a86544c9 (diff) |
Merge "Import translations. DO NOT MERGE am: 1df9bbaafe -s ours am: 6cc2a9cdc2 -s ours am: 5cf5642cbd -s ours am: 7b3e838ec1 -s ours am: 44b2b486ae -s ours" into oc-mr1-dev-plus-aosp
am: 3ebe42353b -s ours
Change-Id: I27171f119e96a7022924e3326c3e24358099c453
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions