tree ee55a75ad8dd61305a4b705196ac5cdb2ca84920
parent f341b77bb3bce96620db682a3bc2dd1d6b0e26f6
parent 59ff28afd923047474a072bbdbb5d0ab6d26ceb1
author Baligh Uddin <baligh@google.com> 1392930249 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392930249 +0000

am 59ff28af: (-s ours) am 60b7b5db: (-s ours) Import translations. DO NOT MERGE

* commit '59ff28afd923047474a072bbdbb5d0ab6d26ceb1':
  Import translations. DO NOT MERGE