tree 0593989fe84d776a393bd7564cf670af6ef480a2
parent 93087746b726c7da739f46aab8ca379f253a5d35
parent 1d95e4c43a3156cf25b41f890d81ca0591300dc1
author Pengquan Meng <mpq@google.com> 1536806217 -0700
committer android-build-merger <android-build-merger@google.com> 1536806217 -0700

Merge "Migrate the NetworkSelection settings" am: 35659d9346
am: 1d95e4c43a

Change-Id: I0eb5bb21af71a30b78f973922240feac724cb112