tree 41167320f79f2d4f92a4f62c3b3aa50b988bd15f
parent 39c62ef39dd3b0af88f9b179be95b48020e82a1f
parent 67a7ee0f2706e1bc127f402fb06b9cac2a7028dc
author Wenchao Tong <tongwenchao@google.com> 1408638034 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408638034 +0000

am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev

* commit 'f654d5b210419e90ba674c73a20a3bcfa9f394e6':
  Revert "Annotate @SystemApi on some WifiManager methods."