OSDN Git Service

am dbfe5a7e: am 06ba28c3: Merge "Pack the update_engine_config.txt when using the...
authorAlex Deymo <deymo@google.com>
Wed, 30 Sep 2015 20:16:46 +0000 (20:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 20:16:46 +0000 (20:16 +0000)
* commit 'dbfe5a7ecb3d891201ffcb255d4d6af62b5d07ff':
  Pack the update_engine_config.txt when using the A/B OTA updater.

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge