tree ba33ffa3aaee6d24b3104f20644711b2c4a6c5f7
parent 0df62a7e1511667043ced8f57b2dab072fb88dd5
parent 9b789d7a30ba3c7f4fd41e3e99c827feb80b0fb3
author Jeff Sharkey <jsharkey@android.com> 1411690913 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411690913 +0000

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

* commit '9b789d7a30ba3c7f4fd41e3e99c827feb80b0fb3':
  Include reason when wiping data.