Commit 30b2bed1 authored by Aaron Whyte's avatar Aaron Whyte Committed by android-build-merger
Browse files

am e3b8ad15: Merge "Gave a CTS telephony test BLUETOOTH permission. In the... 

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: afea4211

* commit 'afea4211':
  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
parents 06f51d55 afea4211
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment