am 23746be0: Merge "Reorganizing permissions into groups oriented around...
am 23746be0: Merge "Reorganizing permissions into groups oriented around user-understandable concepts." into jb-dev
* commit '23746be0':
Reorganizing permissions into groups oriented around user-understandable concepts.