tree 2819d0df63ebb34bd29d50d1fb81fc77d9581d47
parent 272aae0dadf8b63b83e61bc7d9f5093f51e06564
parent 335ebed70555a5b5feb3b685c9b30035035cbe57
author Eric Fischer <enf@google.com> 1365535882 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535882 -0700

am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '680a9d72e3a05733dd83baf22b6a0af7256971c6':
  Import translations. DO NOT MERGE