tree 11c910d42d5c37a29f1ae5c43e4df7c104cddb04
parent a80fca2ec352adcc643a13d3fb0f475e190f270e
parent 42c645e803555d70073a0eddec3d1fb477f0daa0
author Baligh Uddin <baligh@google.com> 1413650250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413650250 +0000

am 42c645e8: (-s ours) am 32b2735a: (-s ours) am ab474588: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '42c645e803555d70073a0eddec3d1fb477f0daa0':
  Import translations. DO NOT MERGE