tree d052a2c5958c584e7cce220bb7e9fd42749198c3
parent 6604496b5334924ddf59d9175c5c0e58e695c06e
parent 513731c04e5c4dc17a2c10c80ebe19066cabc4c1
author Eric Fischer <enf@google.com> 1338575158 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338575158 -0700

am 513731c0: (-s ours) am a3489c50: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '513731c04e5c4dc17a2c10c80ebe19066cabc4c1':
  Import translations. DO NOT MERGE