| commit | f50fc55c6ad37714efddafbdd54d4e110da9e0d8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 16:02:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 16:02:46 2015 +0000 |
| tree | 1bb4f74d62ce290fe3d3c8dfc1e606ed5352f72e | |
| parent | 4406522f42d454be88037e4fa68f2f8886cce7de [diff] | |
| parent | 46ce534894cdb8eab7f69988882be751ebfba39c [diff] |
am 46ce5348: (-s ours) am bb744789: (-s ours) am 6553dd6e: (-s ours) am b9e4739a: (-s ours) Import translations. DO NOT MERGE * commit '46ce534894cdb8eab7f69988882be751ebfba39c': Import translations. DO NOT MERGE