am 0e333b8a: (-s ours) am 07564951: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 20:47:38 +0000 (20:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 20:47:38 +0000 (20:47 +0000)
commitec3e1f27dc549c25e4ed5dd7061f415307a3b045
treee4b8130226a9a6667bc9fd548970327297eacb98
parentaee89280b3772832ad9a9cb80caf9f1a9f8be9a0
parent0e333b8ad819a105e56dcf36bf9ef2487e60b048
am 0e333b8a: (-s ours) am 07564951: (-s ours) Import translations. DO NOT MERGE

* commit '0e333b8ad819a105e56dcf36bf9ef2487e60b048':
  Import translations. DO NOT MERGE