tree 7124f7b1be1d76d102418186278c59d73e2ea413
parent bd6c5577ab0790415b99d24f41b7b3cdd823449d
parent ad9ef191f50767d8d5b6f0fbd4b59bb1400dcd25
author Jeff Brown <jeffbrown@google.com> 1397018007 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1397018007 +0000

Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev