tree 9cf3fef5d9b0b9f0ba226df1b30e6d062362fe96
parent a40b2b3457e233d5f601260761d1f39e894eb384
parent 2ca2c8787130506d350d997c18bbc274faf88e37
author Dianne Hackborn <hackbod@google.com> 1347838962 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347838963 -0700

Merge "More adjustments to permissions." into jb-mr1-dev