tree 8ab36411746cb49bfe41cc5da0e319a0d41eca7d
parent e36b221aaa9a2d9c619c56d0f5ac508c8a02fc78
parent 18c5b6894112d81e792d43be4b9eea0459c7245c
author Pin Li <lipin2@huawei.com> 1516250498 +0000
committer android-build-merger <android-build-merger@google.com> 1516250498 +0000

Merge "dnsmsq: fix not properly handled null pointer checker" am: 81722a62bc
am: 18c5b68941

Change-Id: I397a97a399e2e1d5de7cde38825e9f54f6564f66