tree f16e86b9795bd265c996028481e7a3556995480a
parent 2a026b004d58f86474ba83e038479fc2437419ab
parent 0f0ffc649bffe90f6d96ea702a803a093c580751
author Baligh Uddin <baligh@google.com> 1389117291 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389117291 -0800

am 0f0ffc64: (-s ours) am 484fad59: (-s ours) Import translations. DO NOT MERGE

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