am 88fd7709: Merge "Fix clang string literal conversion warnings."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 5 Jun 2015 18:52:57 +0000 (18:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Jun 2015 18:52:57 +0000 (18:52 +0000)
* commit '88fd77093706d1a0b9b27421b37ef53886634122':
  Fix clang string literal conversion warnings.


Trivial merge