tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 19e93807dc1784f535a1c0b29bcbecd6093fd34d
parent a834ade484d5490c99d7142f403e4d94b798f838
author Baligh Uddin <baligh@google.com> 1422669677 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669677 +0000

am a834ade4: (-s ours) am e8f27a97: (-s ours) am 916421ca: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'a834ade484d5490c99d7142f403e4d94b798f838':