tree e4793280eee38c992b484bbbce9e6b46fc66a4c4
parent d67aff686d467c439970aef4a57a29838bf005c2
parent 455502b7501bdbc55a739083878431c3ba7ef81a
author Andre Eisenbach <eisenbach@google.com> 1423528011 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423528011 +0000

am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev

* commit '455502b7501bdbc55a739083878431c3ba7ef81a':
  Add API to check if a Bluetooth connection is encrypted (1/2)