tree c22d5cd6d32f604db9e09ba3cd21a818f916091e
parent 25fb2e85b23512c8465c86db4e002194ca744035
parent 2bfcd6ad043dfacbf3eb4eac51c8f365a96430bb
author Roshan Pius <rpius@google.com> 1481869035 +0000
committer android-build-merger <android-build-merger@google.com> 1481869035 +0000

Merge changes from topics 'hidl-register-fail-gracefully', 'anqp_hidl', 'supplicant_p2p' am: 4a66dfba7b am: 59e873d886 am: 42386020d2
am: 2bfcd6ad04

Change-Id: Ia43c7c4f5c76ef740e9b68398f7240b15375a9b5