am 9a430d8c: am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread

Merge commit '9a430d8c0e376160f287e50cdad99177e69ec384'

* commit '9a430d8c0e376160f287e50cdad99177e69ec384':
  allow dumpstate to work for non-root users.