tree fcadf92f2117f7cff2b55a75e0548e976c6f0e5c
parent 182ddee6a5d1d8092932df615ebe736a50b979d1
parent 7fe56c4696cfc62655c991b7fafaded102792954
author Eric Fischer <enf@google.com> 1339198552 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339198552 -0700

am 7fe56c46: (-s ours) am bce32b5e: Import translations. DO NOT MERGE

* commit '7fe56c4696cfc62655c991b7fafaded102792954':
  Import translations. DO NOT MERGE