tree 525231a6f4fa41de60bf7232a0c7ff8f72cca6bd
parent 91f736fe1a86f9951b5dc21906b9d8b06dfcf61c
parent 08c4130493651bc5c7877804276fe6dd6b050f60
author Tao Bao <tbao@google.com> 1479148554 +0000
committer android-build-merger <android-build-merger@google.com> 1479148554 +0000

Merge "Fix "ordered comparison between pointer and zero"." am: a844bc9649
am: 08c4130493

Change-Id: I27e56f2771c2f618c81b31bf8f36ccd5dc859a27