tree cf3e1d4b9957032db8046f4bb49d5878cb60a538
parent 8f697ed15faa1785ee59769ecf66d22abed673b5
parent b1195d1c77fa8b5d49fc32ce0daca26f40af767d
author Elliott Hughes <enh@google.com> 1430246358 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430246358 +0000

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

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