tree 5d6c5218104ede99dda3a5f9dc041cb832f20eec
parent 167db392530067341c19b420050aa8a21b7f2616
parent 109038dd9c68bcc9ec5e247b7488c67785ac95fb
author Mike Lockwood <lockwood@android.com> 1282756385 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282756385 -0700

am 109038dd: (-s ours) Fix problem with const result from strchr() [DO NOT MERGE]

Merge commit '109038dd9c68bcc9ec5e247b7488c67785ac95fb'

* commit '109038dd9c68bcc9ec5e247b7488c67785ac95fb':
  Fix problem with const result from strchr() [DO NOT MERGE]