| commit | 453540dd4da15bf508345b857c458cb5b00106ba | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Wed Oct 09 09:12:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 09:12:55 2013 -0700 |
| tree | 3b4995a1afd08923f29fe964e650b389d3c6b469 | |
| parent | 2f704644f85da6f796e287427ffef048520d7b35 [diff] | |
| parent | 93d8bfbc7b0c16192ab087596e831d2bf59f41b2 [diff] |
am 93d8bfbc: merge in KFS78N (no-op) * commit '93d8bfbc7b0c16192ab087596e831d2bf59f41b2': Android: P2P: Restrict GO channels on A-band