tree 3f9cac9b620358c08a1547270a782c9ff00bba68
parent 50758abdc8db6ec4ef4dc487b86b24e27548948f
parent 3970568560f62c87d9ef7a1c0617c16b23271b6e
author Jeff Sharkey <jsharkey@android.com> 1414076877 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414076877 +0000

am 39705685: am e95ed95f: am a6e13ae0: Include reason when wiping data.

* commit '3970568560f62c87d9ef7a1c0617c16b23271b6e':