Skip to content
Commit 2a572d38 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

[automerger skipped] Merge "Modernize codebase by replacing NULL with nullptr"... 

[automerger skipped] Merge "Modernize codebase by replacing NULL with nullptr" am: 1f077d90 am: 9c05f1eb
am: 2e0ed252  -s ours

Change-Id: I168fc6b9604d4533e824961f1cb36e64f478c1f0
parents 6dcc675d 2e0ed252
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment