tree 909143c98a2abf790bb5c17d180ecc591d49f79b
parent cd6cd0064e8829830095c54a9d92714d70f6bd94
parent b131c7003b73c84999b4aa76da853d08a681949f
author Chong Zhang <chz@google.com> 1455670060 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1455670060 +0000

Merge "Clear mPendingScreenOff and stop color fade animiation if screen is on" into nyc-dev