Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp * commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986': Clean up some permissions.
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp * commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986': Clean up some permissions.