tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 477157d88a187c2b9333ee117aef0b0cf68469e0
parent f075f9a17ab01fa13a651c675aed2837a8bf3191
author Tao Bao <tbao@google.com> 1440684828 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684828 +0000

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

* commit 'f075f9a17ab01fa13a651c675aed2837a8bf3191':