tree 1b3709d4761295792e83b1243b21dad6bab3b6e1
parent 57afae6301affdcf8a9d670c37a98ca4c73bf56b
parent 3163fb88a994a50b7d5e93dc5395b6a37ad7718b
author Baligh Uddin <baligh@google.com> 1389112770 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389112770 -0800

am 3163fb88: (-s ours) Import translations. DO NOT MERGE

* commit '3163fb88a994a50b7d5e93dc5395b6a37ad7718b':
  Import translations. DO NOT MERGE