OSDN Git Service

am 2def3df6: am 3c3fa0cc: Merge "Implement Settings app UX for when a user has blueto...
authorMaggie Benthall <mbenthall@google.com>
Thu, 11 Apr 2013 14:12:06 +0000 (07:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Apr 2013 14:12:06 +0000 (07:12 -0700)
commitc20bc9f1cd2171c0b64473c6d582b28218983af5
tree920c0bb075c933af05da8627bb29bc80c02b738b
parent8ce63864848527989e8632ddc488d5c87980b738
parent2def3df600d13000855ce352536b49094d746be4
am 2def3df6: am 3c3fa0cc: Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev

* commit '2def3df600d13000855ce352536b49094d746be4':
  Implement Settings app UX for when a user has bluetooth config locked down.