tree 4bfd9469731811e4156190a6f20a417ad5b44a7c
parent f4cf55076a9e2e993220e30c7d39408ec9c0cdf5
parent 6b642891b9f24edc1020ee93a5d8049b0bef8c06
author Jason Sams <rjsams@android.com> 1259717964 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259717964 -0800

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

Merge commit '6b642891b9f24edc1020ee93a5d8049b0bef8c06'

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