am 797bb4f8: am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread

Merge commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545'

* commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545':
  Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)