tree ee13d7faf77e53526d5255ca607276a6fa3191e4
parent ec172b5f36f89e688a7a1cb43e18cdc5ce79951c
parent 7826f853bcce2c1e707194d92f26538ae9ad7396
author Mark Salyzyn <salyzyn@google.com> 1488412659 +0000
committer android-build-merger <android-build-merger@google.com> 1488412659 +0000

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

Change-Id: Ic2e33c1c81cbbb83b459359403739cd98fdab2e7