tree e0fe798d8b55e2c2e112a95e03a8b8daa3d773d8
parent f80ba4a5dc46e8dfa30de8e5facb15a7cffa480a
parent a4d4df16a6d18add37971bbd41ba58b4ce2ee608
author Ying Wang <wangying@google.com> 1342667686 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342667686 -0700

am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev

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