tree 4cc7ef32629a2a442a94de6624f3cdb35305e1c1
parent 9d16c219f1ca0836a832e25a61fcaf9c1d0dd67b
parent 425d13a0aeded1f750addb2c64cd693109661415
author Jean-Baptiste Queru <jbq@google.com> 1344448539 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344448539 -0700

am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type."

* commit '425d13a0aeded1f750addb2c64cd693109661415':
  Adds missing Bluetooth as network type.