| commit | 0a3bd24f4cc57c1b2679c82a0532103e54b36d07 | [log] [tgz] |
|---|---|---|
| author | Wenchao Tong <tongwenchao@google.com> | Thu Aug 21 16:20:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 16:20:34 2014 +0000 |
| tree | 41167320f79f2d4f92a4f62c3b3aa50b988bd15f | |
| parent | 39c62ef39dd3b0af88f9b179be95b48020e82a1f [diff] | |
| parent | 67a7ee0f2706e1bc127f402fb06b9cac2a7028dc [diff] |
am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev * commit 'f654d5b210419e90ba674c73a20a3bcfa9f394e6': Revert "Annotate @SystemApi on some WifiManager methods."