diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-18 06:27:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-18 06:27:04 +0000 |
| commit | 3c047ea7fa0e63367e17d19c97dcdbc40b4dc1b9 (patch) | |
| tree | d3581ecd99795b9f13256fb98048409766275feb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | cb1a10f5b60cca8fccc40f76e1dde02c8131fff0 (diff) | |
| parent | 437da4c13df1e5cddf74ea2c72803d19d1c2ff0d (diff) | |
Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions