Commit 33457e81 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

[automerger skipped] Merge "Replace NULL/0 with nullptr" am: a160f5a7 am: 83af6009 -s ours 

am: 5c947cdf  -s ours

Change-Id: I0d8d1918c66f65f797c8a26d5d59973e413085ee
parents c9bc53a2 5c947cdf
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment