tree b166f0392e6e95cf0969e8c0cd4c84e1a45639cf
parent af94ad466f5eedddc377cf09d0982848f7d47fa0
parent e4d6829363384f4b0b1b5907eaf98597a689a422
author Selim Cinek <cinek@google.com> 1501192350 +0000
committer android-build-merger <android-build-merger@google.com> 1501192350 +0000

Merge "HeadsUpManager: escalate via wakefulness lifecycle instead of broadcast" into oc-dr1-dev am: 02be5d1ddd am: bbc80d9788
am: e4d6829363

Change-Id: I74c034dae770fad49fd47f0b37d32b5848357eee