tree 87600322f88ae2c8260736d18089c87d96a40847
parent 837150818af0eee993f7d93c5a50c3c7b46f1dab
parent cb6b0f31ede2275e79e6199ec391147585a37a2a
author Ian Rogers <irogers@google.com> 1407965693 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407885275 +0000

Merge "Avoid use of std::string where we have const char*." into lmp-dev