tree db0b1839cf766f1430584e0e927d908cc2927744
parent c6a00808478f8781fd70870f475c3f5097360951
parent f4af752e56cb22bf38b5e43a4199c00840ffc2e8
author Baligh Uddin <baligh@google.com> 1354864988 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354864988 -0800

am f4af752e: (-s ours) am 004945ae: am 6e61c1d4: Import translations. DO NOT MERGE

* commit 'f4af752e56cb22bf38b5e43a4199c00840ffc2e8':
  Import translations. DO NOT MERGE