am 2c63c367: (-s ours) am d58e82b4: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 27 Feb 2015 16:47:52 +0000 (16:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Feb 2015 16:47:52 +0000 (16:47 +0000)
commitfb7a6e0a8e25c613ecc9d10a3ab564d1a5b058aa
treebb27cb19b56f4fbef0649f34fec6888295723516
parent67033b525555ebc51c325faa4b4ff9b3b4985fd7
parent2c63c367443383fffbefbaafcb91a0131275f437
am 2c63c367: (-s ours) am d58e82b4: (-s ours) Import translations. DO NOT MERGE

* commit '2c63c367443383fffbefbaafcb91a0131275f437':
  Import translations. DO NOT MERGE