Merge "Fix valgrind warnings."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 23 Apr 2015 20:13:36 +0000 (20:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 23 Apr 2015 20:13:36 +0000 (20:13 +0000)

Trivial merge