tree 701e14edbcbb3233aaaa76a2c497b0535b377746
parent 415e6f949f0d74f12d3cbdfb4e8d812751e45db1
parent 358ff5d2bf39a3f58572f32ee9789f0b853a2dbb
author Jong Wook Kim <jongwook@google.com> 1541811515 -0800
committer android-build-merger <android-build-merger@google.com> 1541811515 -0800

[automerger skipped] Merge "Add WIFI_ENABLED and WIFI_DISABLED to StaEvent" into pi-dev am: f3375f360e
am: 358ff5d2bf  -s ours

Change-Id: I2bdc2cd9dd87000e9273cac8e00438477ad739e2