tree 8f102b7d6f3ee47838959fb9aef1f1a6e70e731d
parent 8be70c9176a9dc70d77b259e857d3beb13cff524
parent 6edae671aa8f5da345420185f7ecd61fe2d2e6dd
author Eric Fischer <enf@google.com> 1339005973 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339005973 -0700

am 6edae671: (-s ours) am 699ef52c: Import translations. DO NOT MERGE

* commit '6edae671aa8f5da345420185f7ecd61fe2d2e6dd':
  Import translations. DO NOT MERGE