d2de99e377
Merge commit '536ee090ef75add0f7244c1c22be83fe03a66010' into gingerbread-plus-aosp * commit '536ee090ef75add0f7244c1c22be83fe03a66010': Fix name shadowing bug with revoking URI permissions.