tree 6317b863fe3e7cb8abd2b10f4ff48984dbe64208
parent 75dd6f652dccbefb27ce635f514cbc5b5bf16cd0
parent 1254e15e5013df9c62564b37ebb86f6e023e76ae
author Hridya Valsaraju <hridya@google.com> 1536532681 -0700
committer android-build-merger <android-build-merger@google.com> 1536532681 -0700

Merge "Fix sideload for user devices by adding a new sideload config"
am: 1254e15e50

Change-Id: Ib17a58895763d6440dc0e8f7390e9048345aa10b