tree ba826422983b739fb75285ffe93b26077a40c8c0
parent a627f6426f0fde0336b3454dcd04bc5187e2252f
parent 59b1ec5304cb2a791fa94be5081c87ab4f686f53
author Baligh Uddin <baligh@google.com> 1414566022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566022 +0000

am 59b1ec53: (-s ours) am 04631ba7: (-s ours) Import translations. DO NOT MERGE

* commit '59b1ec5304cb2a791fa94be5081c87ab4f686f53':