tree 2d2f78989ea5a4edec3dab316989fc99ccd84c3c
parent 89b6bf5a118322d923cb9349515f06e32003c6ef
parent 448a4e59adf736e7d76daf715ff191e8a0a7eff5
author Prashant Malani <pmalani@google.com> 1402009399 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402009399 +0000

Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev