tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 2addc407d03285ee0f93adc7de333202445bd450
parent c73e18f0a433268300cfaa767b06424df71ff63b
author Tao Bao <tbao@google.com> 1440684829 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684829 +0000

am c73e18f0: am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."

* commit 'c73e18f0a433268300cfaa767b06424df71ff63b':