tree fae8d269664dcdaa6c624ba9712e382adb33f77b
parent ae7ac25ffbbe5d855a7cbc8b940916a24c777027
parent a8ccb2d20a659f55c7e5f670fe90171fe8259d68
author Baligh Uddin <baligh@google.com> 1403552501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403552501 +0000

am a8ccb2d2: (-s ours) am e707db99: (-s ours) am 95b439e0: (-s ours) am c36fa7f8: (-s ours) am 58ce8de3: (-s ours) am 6b48b5de: (-s ours) Import translations. DO NOT MERGE

* commit 'a8ccb2d20a659f55c7e5f670fe90171fe8259d68':