am 2a35c8d7: Merge change I96cb8d0b into eclair

Merge commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782' into eclair-plus-aosp

* commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782':
  fix account permission strings.  this permission is used to protect more than just Google accounts.