tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent ca66fc1cb204dfe9e9b8c8eaad5be95a78207212
parent 5040636abd451e4e45227493f328f1cda39a5177
author Tao Bao <tbao@google.com> 1440646707 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646707 +0000

am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."

* commit '5040636abd451e4e45227493f328f1cda39a5177':