tree bc2f55d515f28a12564be11df8e8a114e3a18792
parent 0622934f48977204fa8a2c3259bb05a31dfbbd59
parent e9e0c65ab11308c84271ab9e1d955fa4c977c4ce
author Baligh Uddin <baligh@google.com> 1400085080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400085080 +0000

am 21a215a4: (-s ours) am e922c085: (-s ours) Import translations. DO NOT MERGE

* commit '21a215a459a3a313295d676e3edac5f8e7a062fc':