tree cf3e1d4b9957032db8046f4bb49d5878cb60a538
parent 5c025ac5c84c19e4eac6ca6e9f5c2f51e09add54
parent bc4e69fc2827d7b8648a30d3b29eca3cb886fc9a
author Elliott Hughes <enh@google.com> 1430245031 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430245031 +0000

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

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