| commit | 70f636087ccc37bf8d2b852c990257a923c44708 | [log] [tgz] |
|---|---|---|
| author | Aaron Whyte <awhyte@google.com> | Fri Sep 04 16:04:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 16:04:40 2015 +0000 |
| tree | 1a701f6edfd4017f0dd3a5479b14a6f0688c96c8 | |
| parent | eb116b72239a899546ae9b1eff4ba206c8619d38 [diff] | |
| parent | 7fba755ce6a36411c0bd415a013c3cab13483e68 [diff] |
am 7fba755c: am 5b9ef496: 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. * commit '7fba755ce6a36411c0bd415a013c3cab13483e68':