am d7dd6019: Merge "Adds missing Bluetooth as network type."
authorJean-Baptiste Queru <jbq@google.com>
Wed, 8 Aug 2012 17:58:29 +0000 (10:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Aug 2012 17:58:29 +0000 (10:58 -0700)
commit5cae217e7c6c8b043eada8041b224e713104f141
tree113d9e7fb2ea21ed986884275c8efeade2a35776
parent6c26e6e1abea4529b2f9a9ab941127d42edba984
parentd7dd6019baf12961dce722d33003e238cdd72f6a
am d7dd6019: Merge "Adds missing Bluetooth as network type."

* commit 'd7dd6019baf12961dce722d33003e238cdd72f6a':
  Adds missing Bluetooth as network type.