tree 91a8d5933cc57dd34e92d913dfc261ed3d1855b4
parent e8617cf83ec606cd1dca9fd4da7a99c547b67318
parent 8b254cfc3ccb67953b62412b0a453f382907b841
author Qiwen Zhao <zhao@google.com> 1447974238 +0000
committer android-build-merger <android-build-merger@google.com> 1447974238 +0000

Merge commit \'27604fcbee0010b800bfc16b5bf7a48c365c2cf3\' into mnc-dr2-dev-plus-aosp
am: 8b254cfc3c

* commit '8b254cfc3ccb67953b62412b0a453f382907b841':
  applypatch: Refactor strtok().