Erik Kline dc7e445bc7 Merge "Switch to WifiManager.{start,stop}SoftAp()" am: 275edcb940 am: 11fdd1769b ...

am: 7d321645a2

Change-Id: I40e72d9b8f99c52089a8c73c8ca20d1efd10c68d

2017-04-20 16:02:06 +00:00

..

android/net

Merge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f

2017-04-19 11:24:03 -07:00

com/android

Merge "Switch to WifiManager.{start,stop}SoftAp()" am: 275edcb940 am: 11fdd1769b

2017-04-20 16:02:06 +00:00