tree a2abdf211ac9dfa694403fd0a4cccf6d5193f40b
parent 6c98775ce85711cf6dbfa9c65ce9367659c77c7f
parent d04923d049c5a164e2da6dec9ece699d403a218f
author Michael Kwan <mkwan@google.com> 1441294080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441294080 +0000

am d04923d0: Merge "Add bluetooth as a supported networking protocol" into lmp-sprout-dev

* commit 'd04923d049c5a164e2da6dec9ece699d403a218f':
  Add bluetooth as a supported networking protocol