tree da12279d97ee25632e177f625f0f81f9e816cc43
parent 8f6ae9798e3a5205e67b0d4267ed24e913d95cfe
parent 20e328e78ee35afbf99209bb8c3d7da10f20ea6f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579718175 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579718175 +0000

Merge "Use Intent.EXTRA_REBROADCAST_ON_UNLOCK instead of hidden API" am: 9222283997 am: 7961f0d579 am: 20e328e78e

Change-Id: I9c19d1002e9f9feb1d88e54bcd630fd92e72cf68