| commit | 67a7ee0f2706e1bc127f402fb06b9cac2a7028dc | [log] [tgz] |
|---|---|---|
| author | Wenchao Tong <tongwenchao@google.com> | Thu Aug 21 16:14:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 16:14:06 2014 +0000 |
| tree | 1322ab6802aedbb6a2efc4ea1b4a31875884511f | |
| parent | 76625e3b7fe1915656c570f910e068a632364ace [diff] | |
| parent | ddd0986311196f389c9b88147620129ec788886e [diff] |
am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev * commit '2954d35a8ea73a59f9b333ecf3497022c57e5476': Revert "Annotate @SystemApi on some WifiManager methods."