tree 77e8278a9d616037bcf7e283f7f909b8d26aecca
parent a35827a8e92c79e200610e93549d7191fe701b19
parent 9a430d8c0e376160f287e50cdad99177e69ec384
author Nick Kralevich <nnk@google.com> 1287700267 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287700267 -0700

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.