tree ffe9768e8153728914a31aa79ef8e76b1e7f7b47
parent 33051ad1785a84ad5d814d6acf337b54d5fab36c
parent 62d0970c82f9a2c17aea67379c207a3f17556c46
author Nick Kralevich <nnk@google.com> 1287687055 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287687055 -0700

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

Merge commit '62d0970c82f9a2c17aea67379c207a3f17556c46' into gingerbread-plus-aosp

* commit '62d0970c82f9a2c17aea67379c207a3f17556c46':
  allow dumpstate to work for non-root users.