tree 7e46a4d50dc1f08ba177d3c1410519a267d7faab
parent 04a9f9abd62a3e8dae003de537c926a5d91514ba
parent 87e7c64385df52380a993e9a830d0da0cabe7591
author Ruchi Kandoi <kandoiruchi@google.com> 1490297397 +0000
committer android-build-merger <android-build-merger@google.com> 1490297397 +0000

Merge "Nfc: Null ptr checks in HAL" am: 3b4d423d42 am: 0ee41f6f8c
am: 87e7c64385

Change-Id: I8706702a3f55ecb6c034e8aa02b3ab4011c2c006