tree c6d5623b1d557827ab5f26772f2d9f7b78fb9887
parent 6e46196cc66e5af4a90b0d98de43861901bb4eb1
parent d86e0cb12ffd07464c613ccc6023c90ed73bee7e
author Paul Hu <paulhu@google.com> 1579076594 -0800
committer android-build-merger <android-build-merger@google.com> 1579076594 -0800

Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister softap callback check"
am: d86e0cb12f

Change-Id: I2ecd1ec6f34bdf1a611f48a6b6a3f589dc30ccc7