tree 81401e15c4c34eaae17542abce386ffbf13b5be1
parent 71716b0594db8df37e0261a119fa33381dc59d65
parent 42c7e065f59643abb68aa0a3fa159adfccaa8ce2
author Baligh Uddin <baligh@google.com> 1414388539 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414388539 +0000

am 42c7e065: (-s ours) am 4fa8a9a9: (-s ours) am aaadf294: (-s ours) am 2790a98c: (-s ours) Import translations. DO NOT MERGE

* commit '42c7e065f59643abb68aa0a3fa159adfccaa8ce2':