tree 0842f8798aaeb5a5eb020a1653bba6112031540e
parent 92be1378f9998ab108e2c4f8de6d53d3481f7586
parent 7441ee7affdf2773c4e3c9408361f83f88acdc92
author Sen Jiang <senj@google.com> 1516928405 +0000
committer android-build-merger <android-build-merger@google.com> 1516928405 +0000

Merge "Add update_channel field to bootloader_message_ab." am: 63eb1a4444
am: 7441ee7aff

Change-Id: I390bba7bd9a76e732873f6abc03a419ec8b2f2d6