Merge commit 'c4989b1b75848acbeaf53850fbcfbf2f8812e325' into eclair-mr2-plus-aosp * commit 'c4989b1b75848acbeaf53850fbcfbf2f8812e325': update the authtoken permission granting UI
Merge commit 'c4989b1b75848acbeaf53850fbcfbf2f8812e325' into eclair-mr2-plus-aosp * commit 'c4989b1b75848acbeaf53850fbcfbf2f8812e325': update the authtoken permission granting UI