tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 319e0f1c26f16f25230e93cea63298481a97de60
parent 30ebce48b1640965674e8cf64f288e6412604b33
author Baligh Uddin <baligh@google.com> 1422669694 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669694 +0000

am 30ebce48: (-s ours) am 1ac363fc: (-s ours) am 68eb6f7b: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '30ebce48b1640965674e8cf64f288e6412604b33':