tree 1f7b847630723e8066f274fd15a986ec5c838ab4
parent 6201cf14f97c2c756b0b54985f2a1c4cda5e9217
parent 80c023dbe22efc39d5b6edef4b9234bb74b18f9d
author Vineeta Srivastava <vsrivastava@google.com> 1369845785 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369845785 -0700

am 80c023db: Merge "Revert "Revert "mako: disable DFS scan, enable country code from SIM""" into jb-mr2-dev

* commit '80c023dbe22efc39d5b6edef4b9234bb74b18f9d':
  Revert "Revert "mako: disable DFS scan, enable country code from SIM""