tree 71866e8a15872238f16ddd7358618942793e59dc
parent 0d4c31a9952a9cf10750d45f003d1472979a33f5
parent c6bed0ab3f9bb1b2858ae5731e299974843f8e49
author Tao Bao <tbao@google.com> 1479149395 +0000
committer android-build-merger <android-build-merger@google.com> 1479149395 +0000

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

Change-Id: I95702aa4777ac1a8b85b8458c7ab4d1f3a1d365d