am 07564951: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 20:43:36 +0000 (20:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 20:43:36 +0000 (20:43 +0000)
commit0e333b8ad819a105e56dcf36bf9ef2487e60b048
tree6c4d66d38abe2d4657c28156788ca386d65462d8
parentcf5a6bdb3224bab4cdd5c47e6f642e47baaea259
parent075649517428dfadeeb3084f50b535f30fedeaa6
am 07564951: (-s ours) Import translations. DO NOT MERGE

* commit '075649517428dfadeeb3084f50b535f30fedeaa6':
  Import translations. DO NOT MERGE