tree ab792ddf298f5bd6aacb64980defbedcae376212
parent d5dd79690eaa95097ce5601961f058f248cdf0c1
parent 6acb1f4a6e68f80b1cb0182f3d334dd8607697b5
author Stephen Hines <srhines@google.com> 1480627791 +0000
committer android-build-merger <android-build-merger@google.com> 1480627791 +0000

Merge "Fix invalid pointer comparisons to 0." am: 334737fa1a am: 8514df9492 am: 955f7c39e7
am: 6acb1f4a6e

Change-Id: I8f7b4cbfa9ffacc7f067dd7b2b0f1a378417102c