am 6ddf7eaa: (-s ours) am 26bc8ca2: (-s ours) am d22d556a: (-s ours) Import translati...
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)
commitcd920d515a1329b36677f8354a9aab2755a94102
treee4b8130226a9a6667bc9fd548970327297eacb98
parentec3e1f27dc549c25e4ed5dd7061f415307a3b045
parent6ddf7eaaa2fc01431e3b71188a3c40674539d7fe
am 6ddf7eaa: (-s ours) am 26bc8ca2: (-s ours) am d22d556a: (-s ours) Import translations. DO NOT MERGE

* commit '6ddf7eaaa2fc01431e3b71188a3c40674539d7fe':
  Import translations. DO NOT MERGE