tree 198690efca2b44cab84715d60d5fa454d23c828b
parent 9fc7d3d61e0e2061e662bfb99f7e86d5a9a68fd8
parent 06ba28c31e9bea93ae3e3994bfe766a0a4a0073e
author Alex Deymo <deymo@google.com> 1443643845 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443643845 +0000

am 06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."

* commit '06ba28c31e9bea93ae3e3994bfe766a0a4a0073e':
  Pack the update_engine_config.txt when using the A/B OTA updater.