tree 10da860fcff71886af91d082e31f0e1917926848
parent 58f0bc3db0155de722067b3d563db97884eb4c0b
parent 266749b5ab4482fa40351f77df8f681a63a88c30
author Baligh Uddin <baligh@google.com> 1422666492 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666492 +0000

am 266749b5: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

* commit '266749b5ab4482fa40351f77df8f681a63a88c30':
  Import translations. DO NOT MERGE