tree e05504d30d8b27c0f221dd2cfc2361e27c49c287
parent 1f8fa93a56478a1300e3aa90e451c02872580b3b
parent de53f6ed295c96b5e23113c44fb6323254f4d147
author Baligh Uddin <baligh@google.com> 1358527070 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358527070 -0800

am de53f6ed: am cac30827: Import translations. DO NOT MERGE

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