tree 8d35e4e4d2eae08fc6b34e560245f3f25680e8f0
parent e7b040c1cec1100056cf8364d4c297705a0cbc43
parent b76e805a2718285b6b25108f0690dffd569ba5c7
author Steven Liu <steveliu@google.com> 1564415007 -0700
committer android-build-merger <android-build-merger@google.com> 1564415007 -0700

Merge "Add the defination of Intent - WIFI_NETWORK_SETTINGS_RESET_ACTION" into qt-r1-dev am: 82aec2e913
am: b76e805a27

Change-Id: Id9b5e37796b0f7d20ac5092f58eb933ab604d3c8