diff options
| author | Bill Yi <byi@google.com> | 2018-04-16 18:43:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-16 18:43:55 +0000 |
| commit | 231719b4d2b0ada5a5f842f90408ea3304b44db6 (patch) | |
| tree | 12e5767c92fdd7decef5e3962516659ef740a3e6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bfcb8b99a59da6fc4b89b6a4b19d24bc803926b9 (diff) | |
| parent | fde5e09eeb5068516c58005bd573473468921a22 (diff) | |
Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped: b230479553
[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions