tree f60a602d4577cc5dbd5ba1a63cb31b08a37c0eba
parent 67ed39bbdb17a516508ceb31a414eeecb5623381
parent ecfae4f899873f224e1aeed076dc8a41f8884487
author Robert Greenwalt <rgreenwalt@google.com> 1385088252 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385088252 -0800

am ecfae4f8: am a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"

* commit 'ecfae4f899873f224e1aeed076dc8a41f8884487':
  fix ethernet and wifi can't be tuned seperately issue