tree 6317b863fe3e7cb8abd2b10f4ff48984dbe64208
parent 19c17b101eb2091c67965ca9665463039f27288c
parent 94e5553f4e346df0b81885c6a57a0283a937e791
author Hridya Valsaraju <hridya@google.com> 1536532945 -0700
committer android-build-merger <android-build-merger@google.com> 1536532945 -0700

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

Change-Id: Ie49bc69638727d1a965af3cbeb8ed03102fd3019