tree 8b84634b2df16995a60b3e84f00887674e902c17
parent edb3fd1f29cbe7f746a8ea671314c7278d167864
parent ed9ef5a778c038bc4618c36eae9df8d11fa9c992
author Baligh Uddin <baligh@google.com> 1367259888 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367259888 -0700

am ed9ef5a7: (-s ours) am af77854a: am 31a70de6: Import translations. DO NOT MERGE

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