Merge "Fix valgrind warnings in negative tests when running on null context."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 27 Mar 2015 19:54:25 +0000 (19:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 Mar 2015 19:54:25 +0000 (19:54 +0000)

Trivial merge