tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent f0942091f21cf6db89d713ec469d8c59f135c922
parent ea8f1f18bd55523171160b1a0595930d14553e68
author Baligh Uddin <baligh@google.com> 1392410171 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410171 +0000

am ea8f1f18: (-s ours) am 98989bd7: (-s ours) am 835c0b74: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit 'ea8f1f18bd55523171160b1a0595930d14553e68':