am d22d556a: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 20:39:53 +0000 (20:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 20:39:53 +0000 (20:39 +0000)
commit26bc8ca28401a108dbc0e686441c6501ff525750
tree1cdb2f421210a6a7cf4ec0373f8e60f8045ee429
parent075649517428dfadeeb3084f50b535f30fedeaa6
parentd22d556aacfdf2534ea54f846078f736e936f9f7
am d22d556a: (-s ours) Import translations. DO NOT MERGE

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