tree 2193f0bd0cb55a8fe310217551e6256c57249589
parent 2bd1c4555e46520a4337ab7550b0c2e0b8a78d34
parent 0a3c847716fa0415a8cc6e6fe47662e484fa3cf6
author Yi Kong <yikong@google.com> 1532454641 -0700
committer android-build-merger <android-build-merger@google.com> 1532454641 -0700

Merge "[binder] Modernize codebase by replacing NULL with nullptr" am: 8978c7c179
am: 0a3c847716

Change-Id: Ia8282dda8e6b6e8f969f6aab555a574e9dad0e10