tree ca6b065069bbfc64d9978f93df5859cf0d9a695a
parent cad87881cdd106ac2e9a51bac8acabd39ce9a2b8
parent dbfe5a7ecb3d891201ffcb255d4d6af62b5d07ff
author Alex Deymo <deymo@google.com> 1443644206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443644206 +0000

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

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