tree d1dc4eba78d1686e5fc5518e2d6feb74b489b7ac
parent ce6bfc93a1843a48f1f459fcefb30bf9f05aa013
parent 2b16bf88c768003291f027fdfac94d84abe9dbe6
author Jeff Sharkey <jsharkey@android.com> 1411662147 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411662147 +0000

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

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