tree 343db4fe780b420a043e36bb82349f87b2d56e6c
parent 2996451f777bd8fb00eeb45ccbb1dd57fc0fbe06
parent c1d80272b117cf837de93fadd8d456d89a203e2f
author Jean-Baptiste Queru <jbq@google.com> 1290216407 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1290216407 -0800

am c1d80272: am 08da5c1f: Merge "vold: replace strsep by strtok_r"

* commit 'c1d80272b117cf837de93fadd8d456d89a203e2f':
  vold: replace strsep by strtok_r