tree 4f96660ea4f34b4f9f30b0f223c554e980d295cc
parent 30a022bf3b76e15c42e4e25f046b022938819494
parent 167c3f6b702a974f185b1fec357ad9de1ff1b13f
author The Android Automerger <android-build@android.com> 1471042305 +0000
committer The Android Automerger <android-build@android.com> 1471042305 +0000

Manually skipping merge commit '167c3f6' into nyc-mr1-dev-plus-aosp
because it was cherry picked from aosp (stephenli@ on advice of deymo@)

* commit '167c3f6':
  Setup a temporary directory for update_engine_sideload.
  DO NOT MERGE: Make update_engine compile in the branch.
  New setting to mark postinstall as optional.
  Report the progress of the update when sideloading.
  Compile update_engine_sideload as a static recovery program.
  Remove libcurl support from update_engine_sideload.
  Build update_engine_sideload.
  Implement a memory-based Prefs class.