tree f27f9900c469b12002432a8c7643d9f697ae8a7a
parent 20d2b5d4905d05a68ff3dd7a7e4d170188a6143a
parent 742ccd759da6dd5474dcf46677fff0283fc076ce
author Siddharth Ray <siddharthr@google.com> 1530223045 -0700
committer android-build-merger <android-build-merger@google.com> 1530223045 -0700

Merge "Fix in Wifi activity updates" into pi-dev am: f83e814b18
am: 742ccd759d

Change-Id: I83a4e7a31bdcbccdb7d8b98df4fac81c4c599ed3