tree 4c4b4d378165db4239f7cb77f3703409b39338c9
parent 60b466492f4964b63cc536c8c813a69c0dd39cb6
parent 1ecb9847b8f6f30496331c486438d9a4ff3ee078
author Dan Stoza <stoza@google.com> 1581661372 +0000
committer Dan Stoza <stoza@google.com> 1581661372 +0000

Merge "power: Add DPF and update imminent hints to AIDL" am: a35e3bb452 am: 2756a9f508 am: 1ecb9847b8

Change-Id: Ia2bd387f627688bff308045da2fefd015dd64afe