am efa4bfce: (-s ours) am 98be4b70: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Oct 2014 22:09:34 +0000 (22:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Oct 2014 22:09:34 +0000 (22:09 +0000)
commit16a80ea74677bfbe19f63cdcef4027b76c89c2ea
treef5537d20fa3c831588bfb1a2621a92f4a47c6b5c
parent683fa2a1849d24686fd71530247c6046b7f4e3ec
parentefa4bfce583c6b6580d0c45ab7c5cb68a7350e38
am efa4bfce: (-s ours) am 98be4b70: (-s ours) Import translations. DO NOT MERGE

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