tree 248481c4397abd7279328f6b2d9dd91ba64ba73b
parent 83681ce58e32ab802ce46e8f1999a90e035a61d4
parent e1949072f96b4d317e318d67b9e055fda2bd3d28
author Mitchell Wills <mwills@google.com> 1465499616 +0000
committer android-build-merger <android-build-merger@google.com> 1465499616 +0000

Merge \"Fix crashes in significant change when wifi hasn\\\'t started am: 11bb0926a6 am: d16695d899\" into nyc-mr1-dev-plus-aosp
am: e1949072f9

Change-Id: Ie7410ed21c2d3b51474adc0f6218d6a2651491c1