tree e1c1b082e3a56f78d6f1e37efc22afcc1b2e904e
parent 5292d36b2714c47b7c8f29aab7affbfb18d96f57
parent c8a85d5129b54f8fe9960e3489bdd2e3c72ad780
author Baligh Uddin <baligh@google.com> 1429236762 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429236762 +0000

am c8a85d51: (-s ours) am 7ee4f42c: (-s ours) am 46a2bb66: (-s ours) am ae815f00: (-s ours) am cd72f7f4: (-s ours) Import translations. DO NOT MERGE

* commit 'c8a85d5129b54f8fe9960e3489bdd2e3c72ad780':