tree 7aff9ccc8bf3e75e9b85bd8a601b3d8be2df08fe
parent bc3fefbacd7c11d147e192f7b3324f1f4dc53b51
parent 61f58f06767863907801299f134dd494543cf8b3
author Peter Qiu <zqiu@google.com> 1490659383 +0000
committer android-build-merger <android-build-merger@google.com> 1490659383 +0000

Merge "hotspot2: register Passpoint related intents as protected broadcast" am: 97bdedf655
am: 61f58f0676

Change-Id: I924befd6d9a1fb1e6bdb257bc6d662172d2354d9