tree dffd76ecdcf5d261e99fa172d5adcc672a31cc9a
parent 87441860bf4df2da7ce4537ad31c8240547da655
parent 1b4a728ac689fc63b5b5153e95b8b634f701fcfb
author Eric Rowe <erowe@google.com> 1413416440 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413416440 +0000

am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev

* commit '1b4a728ac689fc63b5b5153e95b8b634f701fcfb':
  Add CHANGE_NETWORK_STATE permission to bt tests