tree 6317b863fe3e7cb8abd2b10f4ff48984dbe64208
parent cf4d9c711b1b2e41ed714bae5562be30ff894d7a
parent fae21617f9f1a2ce62e2e09082155de0f50a99ad
author Hridya Valsaraju <hridya@google.com> 1536533209 -0700
committer android-build-merger <android-build-merger@google.com> 1536533209 -0700

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

Change-Id: Ida5540b8e9279ccb717c6efc5d4019ac627789a3