tree 13f8b2d2dc35dec034d634e1447d060677a6b55f
parent 49be240735a06f44e1d91aa51dd299779ad36d96
parent 40a91a2884333e48aacf266fde53960e03fa1cc4
author Matthew Xie <mattx@google.com> 1369244213 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369244213 +0000

Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev