diff options
author | Geoff Mendal <mendal@google.com> | 2016-01-11 18:09:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-01-11 18:09:31 +0000 |
commit | 1c3098e627eb43d6c54de2dfd4905a424c80a30d (patch) | |
tree | fe67a59efa0ed65fbfdce79a4d9bb59267fad6ff /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ffaba5f3ece78d84dae8daeeb21ad6faa76e697d (diff) | |
parent | b38f599221e1bc56ca9bb9f510f7f8ec4495e1d2 (diff) |
am e647500f: (-s ours) am 9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am: b38f599221 -s ours
* commit 'b38f599221e1bc56ca9bb9f510f7f8ec4495e1d2':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions