tree 57dd5767449d82401d45707b27ad7d6af7372fa9
parent 928aad3e4d14fff43416d5969f41113fece865e8
parent e4cb6c8a31585de27afe89b1c06e1a5a124d8c66
author TreeHugger Robot <treehugger-gerrit@google.com> 1500648824 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500648824 +0000

Merge "Flicker free screen-on from AOD" into oc-dr1-dev