tree 5a71daba0ca971cc5168b7004733bb756d9902aa
parent e499803e82160f9fd8604ef295ed5d82a4db829d
parent ff87960b474609115f20cb9c0fa6e4b15eebc5c5
author Baligh Uddin <baligh@google.com> 1352504787 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352504787 -0800

am ff87960b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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