From: Ian Rogers <irogers@google.com>
Date: Wed, 13 Aug 2014 05:49:26 +0000 (+0000)
Subject: am 6c6c6f66: Merge "Avoid use of std::string where we have const char*."
X-Git-Tag: android-x86-6.0-r1~145^2~2305
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=36a7599e1683fc0aaa3459512df0f62c58ae094a;p=android-x86%2Fart.git

am 6c6c6f66: Merge "Avoid use of std::string where we have const char*."

* commit '6c6c6f6683cbbb180b8b8c8f55886b067320e1e8':
  Avoid use of std::string where we have const char*.
---

36a7599e1683fc0aaa3459512df0f62c58ae094a