Jeff Sharkey 330f1c0b18 Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev ...

am: 04efa57798

Change-Id: I2cc76316bca81c12e56337d6e36d82b0de6d9ded

2018-04-16 10:07:52 -07:00

..

android

Merge "Add a new ssid field in NetworkCapabilities." into pi-dev

2018-04-13 02:14:02 -07:00

com/android

Revert "OP_GET_USAGE_STATS should be noted, not checked."

2018-04-16 16:39:55 +00:00