Merge "force to use the phone screen timeout from here instead of using the default BluetoothBaseTest" am: d4a9e8eca9
am: 1e1888c3dc

Bug: 67754984
Test: manual run at AutoTest phones

Change-Id: Icd8fd775e5c83cfaccce92a9de4425c6d3b496d9
(cherry picked from commit 990f6d02ca08f9f42cd16b2b2bfa010bb377ec13)
1 file changed
tree: 2b2dc90b6c1fa8a05148043452856cce6db35fa4
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg