tree 366f81f5f30f48e1ce0eedf84e751d0cbfd29fab
parent 80ce5fca35204f2455df99b5c75690c489e0d2e2
parent 67634cc81047cc514c120a8449bb97328c05bcc1
author Eric Fischer <enf@google.com> 1336553732 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336553732 -0700

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

* commit '67634cc81047cc514c120a8449bb97328c05bcc1':
  Import translations. DO NOT MERGE