tree f88f4908e5b3708504762e6e6d20c330a742eb64
parent e93a70a6a3b64b1279c8413e16bedba8dc60e806
parent 715445d0c260e0ea6bece5401f5be73406d2af3a
author Aaron Whyte <awhyte@google.com> 1415985697 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415985698 +0000

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-sprout-dev