tree 10da860fcff71886af91d082e31f0e1917926848
parent 4438716699b4e745b95391a517fe847527898ca3
parent b58c9aa54955417b73745a8b75e2903534493289
author Baligh Uddin <baligh@google.com> 1414566199 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566199 +0000

am b58c9aa5: (-s ours) am 4258f621: (-s ours) am 5f4f95ca: (-s ours) 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 'b58c9aa54955417b73745a8b75e2903534493289':