tree aefc64359eb5416ae374c937a063edf708abd4ae
parent 3b7538e370a8007f846df416136f520f1e09d404
parent 50b0979972946db226620b2cb32bee9ccc9419b6
author Stephen Chen <stewchen@google.com> 1484206790 +0000
committer android-build-merger <android-build-merger@google.com> 1484206790 +0000

Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366 am: 0e7882f2ac am: 272e70bf69
am: 50b0979972  -s ours

Change-Id: I6c96fa4a4033be5236f00082e3c7000a7061dbe9