Merge "Extend Bluetooth startup timeout from 3s to 8s" into m-wireless-dev
tree: 7dd737b6adcaee0ae5f6020d87d3fdb3a0c82d55
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk