diff options
| author | Geoff Mendal <mendal@google.com> | 2015-01-07 17:09:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-07 17:09:53 +0000 |
| commit | 308ad16e52665a204cda888f6dc3313353fa7c68 (patch) | |
| tree | 803f5ddd40f8137ac2e98daf1b20296a94fe21e3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ee7712c0a95033394c73f7d6c511204d81a20d1e (diff) | |
| parent | ec08d889a1b6e35742bcc1bac72fd7a40b5b2a4e (diff) | |
am 56db8228: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: ec08d88 -s ours
* commit 'ec08d889a1b6e35742bcc1bac72fd7a40b5b2a4e':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions