tree 4672cbd26da38f70bdd17660680810c58929e544
parent b55cfebba0af8f83163d9335cb33769c30d53fd5
parent f47348dc796f08316869d802dece9d2cac9c531d
author Cassie Han <xih@google.com> 1526429474 -0700
committer android-build-merger <android-build-merger@google.com> 1526429474 -0700

Merge "Clean cherry-pick 'Fix the auto-select UI.'"
am: f47348dc79

Change-Id: I432fa4023b436d83409fe5f32ffc180760049cb1