tree c3f7b6bda200951ea4adfdde8bd41a58bcf2664a
parent 68f99541fd76a53277118800b967453f88d74044
parent 0f3e20658a2386b68f23c71a83e18b9423e939e9
author Qiwen Zhao <zhao@google.com> 1392424051 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392424051 +0000

am 0f3e2065: Merge commit \'8fa85d20\' into klp-dev-plus-aosp

* commit '0f3e20658a2386b68f23c71a83e18b9423e939e9':
  Import translations. DO NOT MERGE