tree b6541b21b0ec518d90c1ff6b04ea34d9ee137ba6
parent 7f41584d9d9072305535a5063ef73a2ae51aa49f
parent 6feecf0337c7b242cf052b297f03522dfd2f0fbe
author Tao Bao <tbao@google.com> 1526586604 -0700
committer android-build-merger <android-build-merger@google.com> 1526586604 -0700

Merge "updater_sample: add switch slot demo" am: 2ddc54f5fd am: 4f26e44969
am: 6feecf0337

Change-Id: I411045c8260782c0612001e09831eef409d29099