| commit | a69012973c16e15f7ca873d4801a8ac68129a5a6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon May 25 13:40:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 25 13:40:17 2015 +0000 |
| tree | ea8ff356274ddd7be2c82c778d3b36254ac3c963 | |
| parent | fbcae61c65ee2e4eaadc2da1c36a3ccf669bd8a8 [diff] | |
| parent | 2ad96b85fddb5a94875a28d84f9b262ea3f1104d [diff] |
am 2ad96b85: (-s ours) Import translations. DO NOT MERGE * commit '2ad96b85fddb5a94875a28d84f9b262ea3f1104d': Import translations. DO NOT MERGE