am 26bc8ca2: (-s ours) am d22d556a: (-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)
commit6ddf7eaaa2fc01431e3b71188a3c40674539d7fe
tree6c4d66d38abe2d4657c28156788ca386d65462d8
parent0e333b8ad819a105e56dcf36bf9ef2487e60b048
parent26bc8ca28401a108dbc0e686441c6501ff525750
am 26bc8ca2: (-s ours) am d22d556a: (-s ours) Import translations. DO NOT MERGE

* commit '26bc8ca28401a108dbc0e686441c6501ff525750':
  Import translations. DO NOT MERGE