tree c41808e8dd1bb3b641e13ea9b8f4f0eab5577fe7
parent 21fd4ab93f1959ad5e2eb1d609d3ccc491615d15
parent e33f6d36f0142050b29e2243c08b90d2d8683fb6
author Baligh Uddin <baligh@google.com> 1349726557 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349726557 -0700

am e33f6d36: am e3304327: Import translations. DO NOT MERGE

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