tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 31071314cf566b517b9098d8432c60a688223663
parent baa5881192234e830f7a239f10a412dd58084884
author Baligh Uddin <baligh@google.com> 1392410128 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410128 +0000

am baa58811: (-s ours) am 751f5fdc: (-s ours) am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit 'baa5881192234e830f7a239f10a412dd58084884':