tree ee13d7faf77e53526d5255ca607276a6fa3191e4
parent 05930f7179e19f83224ed1d5b2ce282cf6076ac9
parent dcf6021ee19036c6685ff9cada8105ea87b10321
author Mark Salyzyn <salyzyn@google.com> 1488412959 +0000
committer android-build-merger <android-build-merger@google.com> 1488412959 +0000

Merge "liblogcat: replace NULL with nullptr" am: 7826f853bc
am: dcf6021ee1

Change-Id: I553c77d877e18424566bb14111bad2adbfa2cf1e