Commit 5c947cdf 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

Change-Id: I7487cb843f2973f81c9168363451a83f115169f2
parents fef7d7c6 83af6009
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