tree 3ebb5b9f6772bead4153f58aff5a27b35303709e
parent c88a4e474d9c3768083f26b519c8fb716f7799a3
parent a9becd0099ae44a6e11b63b2d0c0a84eca07a23a
author Ying Wang <wangying@google.com> 1342120060 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342120060 -0700

am a9becd00: (-s ours) am c03f0a15: Merge "Import translations. DO NOT MERGE" into jb-dev

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