| commit | 4ea30fd58f6bfefba80ec479b1a07a65e1b4cf55 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 22 14:12:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 22 14:12:42 2015 +0000 |
| tree | e16a9964f05b2f7025338dfab7b3ee9df012a056 | |
| parent | ca1eaad2c0e996a7866bab99e41fe1c594691b37 [diff] | |
| parent | 608ec572638c75b7b3e05650b22c9049238fde33 [diff] |
am 608ec572: (-s ours) am 8cad4b59: (-s ours) Import translations. DO NOT MERGE * commit '608ec572638c75b7b3e05650b22c9049238fde33': Import translations. DO NOT MERGE