tree 11e03ff242bc8e44de2881bbc7a89839da872deb
parent e4a2c2e37f94050499f5b5411980fac4d074cce1
parent 0c78d9eff8d4f1398759024f9e3c56fa28111fc8
author Baligh Uddin <baligh@google.com> 1353117390 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353117390 -0800

am 0c78d9ef: am e007c0e8: am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '0c78d9eff8d4f1398759024f9e3c56fa28111fc8':
  Import translations. DO NOT MERGE