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)
* changes:
  Escape non-printable characters in xeXMLWriter.
  Fix shader info log including 0-terminator.


Trivial merge