tree 33ad27ef3d1cd9d4198e161e8e6c8baacd82d71e
parent 1824766048ebed1e7d27b4d5764bfe71fe77613a
parent 82aec2e913bf6b0df7f5dbf40ffca6e054ee1317
author Steven Liu <steveliu@google.com> 1564414639 -0700
committer android-build-merger <android-build-merger@google.com> 1564414639 -0700

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

Change-Id: I4265de5dc6432700ac23c484e1614c3f2e5fe550