commit | 8f986d22abb4c179d914aeef2a8bed2888cd0626 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Jun 18 03:40:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 18 03:40:57 2015 +0000 |
tree | 5be782b854b592fce861bfe8c8e9d44abede701f | |
parent | 08c96a5ba3758caace2ae537f3aa43490b750910 [diff] | |
parent | 8cd680ba7a6bab5eae32fe3b3297b7761281bcbb [diff] |
am 170ca1cc: (-s ours) Import translations. DO NOT MERGE * commit '170ca1ccd81a1a73bec94fa468a8b54d7d25717b': Import translations. DO NOT MERGE