| commit | 7bb7e4af981ed32c70a37d2b345b5e79abe5f49e | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Wed Oct 09 09:12:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 09:12:14 2013 -0700 |
| tree | 6f12904a0033912370f847f611864f1a2661c8bd | |
| parent | 84ea84d589552b2bd21e4590df41ee9f4693442b [diff] | |
| parent | 69ea6b41e56bfe880dbfbb7e4c1a5811440b79f5 [diff] |
am 69ea6b41: am aa48285b: merge in KQS81M * commit '69ea6b41e56bfe880dbfbb7e4c1a5811440b79f5': manta: wifi: Override control iface to leave it to global