tree 466233feaf955bb08b07bf4036ef2311d8447d4c
parent 085933cc8fa0b06d28161ddc001c20282012f263
parent 8fde916de89b5f0e777f687f3290976ec124faa5
author fionaxu <fionaxu@google.com> 1463094355 +0000
committer android-build-merger <android-build-merger@google.com> 1463094355 +0000

Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
am: 8fde916de8

* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
  disable wifi only mode from wfc setting for nyc

Change-Id: Ie74e4e0017ce4d514d5d458e05c2b226164a3bb6