commit 30b2bed1d8e508f1de1b7fcd9244b092b025f0f4
author Aaron Whyte <awhyte@google.com> Fri Nov 14 20:42:51 2014 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 14 20:42:51 2014 +0000
tree e7a47ab6206ce7e80b9560bcb2c720e83b2d4820
parent 06f51d55a2591e9599038b30d33d37e9acee2d2f
parent afea42118389a9688821b3e7f37a4eb24d46cbea

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
automerge: afea421

* commit 'afea42118389a9688821b3e7f37a4eb24d46cbea':
  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