tree b550953a5c706a2c0db40839730d0d8876684909
parent 320e6966e0d3ecf2eed56e9c2c03fe9e9040c84e
author Mike Lockwood <lockwood@android.com> 1274297826 -0400
committer Kenny Root <kroot@google.com> 1282686246 -0700

Fix problem with const result from strchr() [DO NOT MERGE]

Needed for simulator build on newer Ubuntu distributions.

Based on Ibb8cd3cdb4feae89a20eec56131e322f39721b1a

Change-Id: Ie574888128265e026973a5ac88ede87730eda7d4