tree 1d279871a5b170d7f405dfb337d3971937730db1
parent 2f3c23858f091545b6bdbe1e4141e1e4b86ba7af
parent bba150b6fc733847a04014abb22624c2c9456025
author Baligh Uddin <baligh@google.com> 1395341607 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395341607 +0000

am bba150b6: (-s ours) am febf1b9c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly

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