Merge "Remove permission check in registerAdapter" into jb-mr1-dev

author Matthew Xie <mattx@google.com>

Wed, 26 Sep 2012 04:04:14 +0000 (21:04 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 26 Sep 2012 04:04:15 +0000 (21:04 -0700)
author Matthew Xie <mattx@google.com>
Wed, 26 Sep 2012 04:04:14 +0000 (21:04 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 26 Sep 2012 04:04:15 +0000 (21:04 -0700)
diff --cc services/java/com/android/server/BluetoothManagerService.java
Simple merge
author	Matthew Xie <mattx@google.com>
	Wed, 26 Sep 2012 04:04:14 +0000 (21:04 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 26 Sep 2012 04:04:15 +0000 (21:04 -0700)