tree f619983d7391e762e4021a5271aa0de92ad47311
parent f2574b8206030158b319f96fd78d82840da73194
parent a844bc9649d039f5f689b7e264993d35442833a3
author Tao Bao <tbao@google.com> 1479148098 +0000
committer android-build-merger <android-build-merger@google.com> 1479148098 +0000

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

Change-Id: If12e825a23c17730a35a2875c14d1d25d9d41038