tree 078cc0943e79d31246bdb069f494becc30968393
parent 10662532be29eac9f6e7bffd5f977a47af0c0228
parent e8acc01bdfe85abab22edd09fe0ce9226d03420a
author Android Build Merger (Role) <android-build-merger@google.com> 1499446295 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499446295 +0000

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