tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 990e58107eda2a925b2571293b403dc1df2a08df
parent ee82d2f21dc3f89f43601b3f60ed0155f0711c9f
author Baligh Uddin <baligh@google.com> 1422669737 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669737 +0000

am ee82d2f2: (-s ours) am a703eb0f: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'ee82d2f21dc3f89f43601b3f60ed0155f0711c9f':