tree 5d996eef77953f1eae990d3f80a701aa11a3833e
parent 77fbda4bb4f8c4f0fc75ff8d8f60d8145c4c5876
parent 48ab56c5cda3d35f885ae50ac2d20567c28ab203
author Alex Deymo <deymo@google.com> 1443644657 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443644657 +0000

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

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