tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent d37f91d18da6e87eb3f2d11dd1cd1645e255cd38
parent 33185233541dda72af3fd8a1fc1786251c88e122
author Tao Bao <tbao@google.com> 1440646710 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646710 +0000

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

* commit '33185233541dda72af3fd8a1fc1786251c88e122':