tree ab792ddf298f5bd6aacb64980defbedcae376212
parent bf14626be306849488aacc171a8e85a0dead645b
parent 955f7c39e7bebf78706a2fde3c50bcccdabd5052
author Stephen Hines <srhines@google.com> 1480627461 +0000
committer android-build-merger <android-build-merger@google.com> 1480627461 +0000

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

Change-Id: I2df1e8868cc383ac2eac3f76ecd1656834a4a87d