tree 547defc62ede0ccd0d9b3d8d71f004f70871cef6
parent aafe912e8364b6e5503180b16d26f1d53818721a
parent 797bb4f83dfcaf263c72b760dfa279e3fbb8d545
author Fabrice Di Meglio <fdimeglio@google.com> 1285958137 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285958137 -0700

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)