am 4099afd8: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 25 Sep 2015 02:59:16 +0000 (02:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Sep 2015 02:59:16 +0000 (02:59 +0000)
commitb54f5f60ef0e41cf75c2156a5da67ce9858ccf9c
tree88584f1c39f42e5a2210898e15c69a7a3ab292c3
parent903b56949549d78af56f832bba490659c77d0fa6
parent4099afd8117743bdab7ea4281638adadf0f501ba
am 4099afd8: (-s ours) Import translations. DO NOT MERGE

* commit '4099afd8117743bdab7ea4281638adadf0f501ba':
  Import translations. DO NOT MERGE