tree b6541b21b0ec518d90c1ff6b04ea34d9ee137ba6
parent 41e47d6d0af2011c316629a5e5661f911439fa19
parent 4f26e44969cd0604c56baa474092e85b4a3ca624
author Tao Bao <tbao@google.com> 1526586295 -0700
committer android-build-merger <android-build-merger@google.com> 1526586295 -0700

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

Change-Id: If5faa3401c43c321c5566ee049113d8dd152ed74