tree 27e47a9de5119e7bc17dc433073245c57cef14ed
parent 269921d39092c7d09ec234d21908853a6ced6b52
parent 36cce31402de8f71c8049aed596f55f929ff7844
author Eric Fischer <enf@google.com> 1337971086 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337971086 -0700

am 36cce314: (-s ours) am 23fa01bb: Import translations. DO NOT MERGE

* commit '36cce31402de8f71c8049aed596f55f929ff7844':
  Import translations. DO NOT MERGE