am 7afa1613: am a848d344: Merge "Fix bug in permission grant system." into gingerbread

* commit '7afa161368308e78bb4a66b4fd32558dfd556776':
  Fix bug in permission grant system.