tree 99afa5ef991853ad572bebce93913af3baf52dfc
parent c833cbbce524c6053ffa3f5a5009e0469a1769cd
parent 1fdde7981b5d081cc3f76fe4bac08fbe10a67a03
author Jason Sams <rjsams@android.com> 1259717382 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259717382 -0800

am 1fdde798: am eb5615d1: Rename special dump properity so we can set it on user builds.

Merge commit '1fdde7981b5d081cc3f76fe4bac08fbe10a67a03' into eclair-mr2-plus-aosp

* commit '1fdde7981b5d081cc3f76fe4bac08fbe10a67a03':
  Rename special dump properity so we can set it on user builds.