Merge changes If9baae21,I67223279
authorJarkko Pöyry <jpoyry@google.com>
Fri, 27 Mar 2015 19:54:57 +0000 (19:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 Mar 2015 19:54:57 +0000 (19:54 +0000)
commit101f9b6d6e8504da3768d96da35866a860af3394
treef3088d544573caf1ff05cc8114e6ad19658979ab
parente57b3f6f5d4846d95ce6fde976e2d032edf28e27
parent368115f54422a1007cfe1367896c181fb89833df
Merge changes If9baae21,I67223279

* changes:
  Escape non-printable characters in xeXMLWriter.
  Fix shader info log including 0-terminator.