tree 7ab6c37d87aaefaf7cf14d79b8665bf88e4f72a5
parent 587fa427974255af65bff06d5f6ca50f057cad91
parent 0c0ac2b12663e2d827910d8f7bb93116e830dde6
author Hall Liu <hallliu@google.com> 1554153277 -0700
committer android-build-merger <android-build-merger@google.com> 1554153277 -0700

Merge "Check additional constraints on requestNetworkScan" am: 9d3036297a
am: 0c0ac2b126

Change-Id: Iefe85e1f132f9b399994f2be33fe741b5ef14b49