tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 258f83cc65373b13a697485210ad6805d96fa28e
parent f6bebbd72cf25acc65373cf26c3eac7d4b6bf686
author Tao Bao <tbao@google.com> 1440684830 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684830 +0000

am f6bebbd7: am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."

* commit 'f6bebbd72cf25acc65373cf26c3eac7d4b6bf686':