tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 3af4d76f2900be38761a82de0b8a5418e6db0831
parent 990e58107eda2a925b2571293b403dc1df2a08df
author Baligh Uddin <baligh@google.com> 1422685366 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685366 +0000

am 990e5810: (-s ours) am eaa035fb: (-s ours) am 153c3ddc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

* commit '990e58107eda2a925b2571293b403dc1df2a08df':