am 590ccb96: (-s ours) am c7c23071: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 13 Feb 2015 01:21:01 +0000 (01:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Feb 2015 01:21:01 +0000 (01:21 +0000)
commitb37d1af8c3a1d57540180a1d25b20c004dcc1a01
tree2ac70b2b885c3d6e9be36e41cbe46caf712cad79
parent5ddfbce059c3ba1b9c3cfd4b015156bfbc800b9c
parent590ccb96d0bd46014ce6767c5b0a8ef7109a8274
am 590ccb96: (-s ours) am c7c23071: (-s ours) Import translations. DO NOT MERGE

* commit '590ccb96d0bd46014ce6767c5b0a8ef7109a8274':
  Import translations. DO NOT MERGE