tree d06ada73fa743c58226e22d2578478e0424f2dd3
parent 5beec5903f2dd910e5625c027df3243985988ea8
parent 63dd7e72151d3e76f3d01d420f5068b94b6d35c9
author Baligh Uddin <baligh@google.com> 1381018435 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381018435 -0700

am 63dd7e72: (-s ours) am a4baa5ae: (-s ours) Import translations. DO NOT MERGE

* commit '63dd7e72151d3e76f3d01d420f5068b94b6d35c9':
  Import translations. DO NOT MERGE