| commit | fef6f8a47e9940bf46be2d8f15b2f6d0abd31d22 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 22 14:38:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 22 14:38:29 2015 +0000 |
| tree | b7ab9339eccc09ffefb2f20cd5709d9f60d8d38e | |
| parent | 05811a3bd2a26e48760558789faa0a01987f748b [diff] | |
| parent | f05f6309716e3b39c6d0999f72bcebcfe873a733 [diff] |
am f05f6309: (-s ours) am 4d44f17c: (-s ours) am 3862452f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'f05f6309716e3b39c6d0999f72bcebcfe873a733': Import translations. DO NOT MERGE