tree 37dc6f70d138489d60d5bd975aeefe58331ed038
parent e8b1503fdc85c1e30db375569a8d96cdf28d3ddd
parent 803b04f835768f1e121438ecdb3ba2f332c39818
author Rhiannon Malia <rmalia@google.com> 1497080519 +0000
committer android-build-merger <android-build-merger@google.com> 1497080519 +0000

Merge "Update captive portal notif for Android TV am: 6ab655227a am: 49ffd6bae2" into oc-dr1-dev-plus-aosp
am: 803b04f835

Change-Id: I460f2fa866fd9a88f75ab7ba5796e0b572b9e16e