tree 8b84634b2df16995a60b3e84f00887674e902c17
parent da3c0cb9d33f259fe8b224251d4a439df1593059
parent fc28160112f6f1b34e17891c208db859b35c417a
author Baligh Uddin <baligh@google.com> 1367259887 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367259887 -0700

am fc281601: (-s ours) am 8f4cad6f: (-s ours) am 78e92b5c: Import translations. DO NOT MERGE

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