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)
commitc8632281a77b0c7c49f4be240651fe2fb445a00a
treea315df9b77a125201e1c67cb73db3a86b4ebc3f6
parentbe7927e7a916a9bd06408b90571cc46bfd7717fe
parent88fd77093706d1a0b9b27421b37ef53886634122
am 88fd7709: Merge "Fix clang string literal conversion warnings."

* commit '88fd77093706d1a0b9b27421b37ef53886634122':
  Fix clang string literal conversion warnings.