am 6b995479: am fae288c7: Merge change I9efe265f into eclair

Merge commit '6b9954790e6f4f48d9585dd50131d8080a086cc8' into eclair-mr2-plus-aosp

* commit '6b9954790e6f4f48d9585dd50131d8080a086cc8':
  unhide AccountManagerResponse