tree dbaff6cacdc3f7f0794d30e06d9064e22930dfe9
parent da491f048fb33b572713b4287436c1cac6898670
parent 680a9d72e3a05733dd83baf22b6a0af7256971c6
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