tree c07346219b0f90050d6347eeff2f5d412be61e33
parent fb9e06531122174e6096feb508280d0ddb8303bb
parent a084543c63080c142fb7f4b0223a6d03303253c7
author Cassie <xih@google.com> 1522199949 +0000
committer android-build-merger <android-build-merger@google.com> 1522199949 +0000

[automerger skipped] Merge "Change the Auto-select Network UI." am: 6af2727b7b am: 39a0e83f84  -s ours
am: a084543c63  -s ours

Change-Id: I18a379c978e6c9c0554d19978564238c298c5651