am 6ed30705: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 18 Sep 2015 17:16:29 +0000 (17:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Sep 2015 17:16:29 +0000 (17:16 +0000)
commita4a4b85d344fb6d2b571023c1b1b7d2877c7bbc6
tree88584f1c39f42e5a2210898e15c69a7a3ab292c3
parent23092ff679f7b72df927cf30440063b4eb6a1c09
parent6ed30705f468b2eb036899acf944bda523399fd2
am 6ed30705: (-s ours) Import translations. DO NOT MERGE

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