am c8cb253d: (-s ours) am 234114ea: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 12 Feb 2015 20:18:17 +0000 (20:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Feb 2015 20:18:17 +0000 (20:18 +0000)
commit67033b525555ebc51c325faa4b4ff9b3b4985fd7
treebb27cb19b56f4fbef0649f34fec6888295723516
parent96dedc42900f50162841aa3de76b9a256dd346c5
parentc8cb253d8d21936538a53f4e60577fe83bef08a2
am c8cb253d: (-s ours) am 234114ea: (-s ours) Import translations. DO NOT MERGE

* commit 'c8cb253d8d21936538a53f4e60577fe83bef08a2':
  Import translations. DO NOT MERGE