tree 51a86cf542c66047664cd6073429056c4aca640d
parent c93d558a53424f625129a9da2ece376a52896854
parent e1a867f68d3727908be1c2cfc90a5ba6a5785c17
author Zhihai Xu <zhihaixu@google.com> 1354233977 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354233977 -0800

am e1a867f6: Merge " BluetoothManagerService call should allow SYSTEM_UID" into jb-mr1.1-dev

* commit 'e1a867f68d3727908be1c2cfc90a5ba6a5785c17':
  BluetoothManagerService call should allow SYSTEM_UID