tree b13a7fc27ccce183fc2c6a7ebe65eec509d7dd46
parent 1a5f387bcf26a6845a4fa744b8f54449ae70082f
parent 40874a096ba6448ebffea4b17486dbfbc957c0df
author Zhihai Xu <zhihaixu@google.com> 1349887952 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349887953 -0700

Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev