commit afea42118389a9688821b3e7f37a4eb24d46cbea
author Aaron Whyte <awhyte@google.com> Fri Nov 14 17:24:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 14 17:24:58 2014 +0000
tree dc8d504bca2ac5bdbd5e6213b5b1ddeb71fff7f4
parent f6325add262afb4dafe4e052ba459bba4306e0ad
parent e3b8ad15649d09d8b111d35b3b1a31fcda844714

am e3b8ad15: Merge "Gave a CTS telephony test BLUETOOTH permission. In the case where there is no telephony and no wifi, TelephonyManagerTest.testGetDeviceId() uses the BlueTooth MAC address. That\'s the case that many Clockwork devices hit. Bug: 18369670" into lmp-spr

* commit 'e3b8ad15649d09d8b111d35b3b1a31fcda844714':
  Gave a CTS telephony test BLUETOOTH permission. In the case where there is no telephony and no wifi, TelephonyManagerTest.testGetDeviceId() uses the BlueTooth MAC address. That's the case that many Clockwork devices hit. Bug: 18369670