tree cf3e1d4b9957032db8046f4bb49d5878cb60a538
parent 5a95719bd9ac27d573388e6aa4b48715d9aa3d9e
parent 8c389e9c769c8632cf16c0794f1e84f49996077c
author Elliott Hughes <enh@google.com> 1430244202 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430244202 +0000

am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."

* commit '8c389e9c769c8632cf16c0794f1e84f49996077c':
  Stop using adb_strtok, and check argument validity.