| commit | f075f9a17ab01fa13a651c675aed2837a8bf3191 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Thu Aug 27 03:38:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 03:38:27 2015 +0000 |
| tree | 69d6a47242f47951fc81617abee8d63d8b26de93 | |
| parent | ca66fc1cb204dfe9e9b8c8eaad5be95a78207212 [diff] | |
| parent | 5040636abd451e4e45227493f328f1cda39a5177 [diff] |
am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." * commit '5040636abd451e4e45227493f328f1cda39a5177':