tree 078cc0943e79d31246bdb069f494becc30968393
parent 57d2711007880151bfd19f711ae7dd690b48abf7
parent b95b8e7cee5c4544668b7afd87e813733b9948b9
author Android Build Merger (Role) <android-build-merger@google.com> 1499446061 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499446061 +0000

Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am: 3bd612f92b am: 1b94e6c444"