tree 7b97e2aa7414120d67fc5b388d12d14adf0b24f9
parent 5f19844067af27906828af7caed8e8b9c09cac4a
parent 727b462a92635665ce636c63123078a970654480
author Dan Albert <danalbert@google.com> 1439484775 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439484775 +0000

am 727b462a: Merge "Never allow -w."

* commit '727b462a92635665ce636c63123078a970654480':
  Never allow -w.