tree 525231a6f4fa41de60bf7232a0c7ff8f72cca6bd
parent 0b2be22f01ee0ebbf805725f334e8ed2168af5e8
parent 0f819849701c0154f7207b6a8a31e06ebbbc2ff6
author Tao Bao <tbao@google.com> 1479148974 +0000
committer android-build-merger <android-build-merger@google.com> 1479148974 +0000

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

Change-Id: I1a5b82fc1c48237b0100cf57f3e2fdd49fe30b23