tree 7d12c351979cc37a1735c95633b9557a70ae66fc
parent 4725b58e54f1d9898949755980f6427045442529
parent 3ffa3798786fc77a3b3fa905cd978688b827fead
author Baligh Uddin <baligh@google.com> 1355532513 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355532513 -0800

am 3ffa3798: (-s ours) am 8a3eb664: am 435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '3ffa3798786fc77a3b3fa905cd978688b827fead':
  Import translations. DO NOT MERGE