diff options
author | Bill Yi <byi@google.com> | 2016-06-27 18:09:39 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-27 18:09:39 +0000 |
commit | 3fedc0c32edb0c0eb25ed8a700b8a6767eb8135b (patch) | |
tree | d5432e611656024712d38073679db18817475b50 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 50c8bea333377dea7ab473c1c2b04d5eb5d1d84b (diff) | |
parent | 3b3d17c9cb87c2cf36fc1a8e4d504a4900cb6bc1 (diff) |
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: cc67847367 -s ours am: 63d528b12a -s ours
am: 3b3d17c9cb -s ours
Change-Id: I6b14ec95784b8040bcbe7b8415e3613b1cd954cd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions