diff options
| author | Geoff Mendal <mendal@google.com> | 2016-01-11 18:06:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-11 18:06:29 +0000 |
| commit | ffaba5f3ece78d84dae8daeeb21ad6faa76e697d (patch) | |
| tree | fe67a59efa0ed65fbfdce79a4d9bb59267fad6ff /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 18e8be647d9c235608c41fe065641fe7fcc43698 (diff) | |
| parent | d6a9daa65e9237914f8877fd6d9a6965e1e39147 (diff) | |
am 44acc73e: (-s ours) am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am: d6a9daa65e -s ours
* commit 'd6a9daa65e9237914f8877fd6d9a6965e1e39147':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions