tree 774fb51d85b83257793e32132e8405567bb7d783
parent b84b9c21919a067ee989f70667c1cfa2f817c46e
parent 8672f044ffba414c6caade21cff8b55a707713f0
author Baligh Uddin <baligh@google.com> 1355199699 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355199699 -0800

am 8672f044: (-s ours) am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '8672f044ffba414c6caade21cff8b55a707713f0':
  Import translations. DO NOT MERGE