tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent a7b0986be5ea17efca2d84e4f91c3202b73183cc
parent 038707b4f74428d0468e6966106e5c4372252036
author Baligh Uddin <baligh@google.com> 1422669676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669676 +0000

am 038707b4: (-s ours) am ce2e385c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-master

* commit '038707b4f74428d0468e6966106e5c4372252036':
  Import translations. DO NOT MERGE