tree d5f66482ba390efb35b2aa27e3019c9e62ddde2e
parent 2a0f42b58d41d2c115ba79d98605bd73bd5ab6ef
parent 2b16bf88c768003291f027fdfac94d84abe9dbe6
author Jeff Sharkey <jsharkey@android.com> 1411601743 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411601743 +0000

am 2b16bf88: Merge "Include reason when wiping data." into lmp-dev

* commit '2b16bf88c768003291f027fdfac94d84abe9dbe6':
  Include reason when wiping data.