am 98be4b70: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Oct 2014 22:05:59 +0000 (22:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Oct 2014 22:05:59 +0000 (22:05 +0000)
commitefa4bfce583c6b6580d0c45ab7c5cb68a7350e38
tree2efe9129cad6d3ba4d61681999209de91d1151f4
parent5daa6dd11cfe3bc7b814dd994b1fdc7ad878de9f
parent98be4b708d4ffc1c5b497c198e0ca1d85f8ab7c0
am 98be4b70: (-s ours) Import translations. DO NOT MERGE

* commit '98be4b708d4ffc1c5b497c198e0ca1d85f8ab7c0':
  Import translations. DO NOT MERGE