tree f5c53f17365993815876c49380672490c3f578a6
parent e361c45b145788931c55c704ae86df155a4229c2
parent a2e9f101bd2369d4d344d04c317882d1ef90058c
author Baligh Uddin <baligh@google.com> 1349927811 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349927811 -0700

am a2e9f101: (-s ours) am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'a2e9f101bd2369d4d344d04c317882d1ef90058c':
  Import translations. DO NOT MERGE