tree 10da860fcff71886af91d082e31f0e1917926848
parent 038707b4f74428d0468e6966106e5c4372252036
parent e8f27a97273802fbf55874cf34b6d2ed14165640
author Baligh Uddin <baligh@google.com> 1422666459 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666459 +0000

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

* commit 'e8f27a97273802fbf55874cf34b6d2ed14165640':