tree d8829fa329ee487bc6e12500d2c893ec6e854c48
parent 36285367fd33b2210cbecec67aade65399c7d149
parent 6d47579d78a1c731aaeb8f3682ddf557952f186f
author Baligh Uddin <baligh@google.com> 1354849132 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354849132 -0800

am 6d47579d: am 82bdbbfc: Import translations. DO NOT MERGE

* commit '6d47579d78a1c731aaeb8f3682ddf557952f186f':
  Import translations. DO NOT MERGE