tree 135ce2b8880bb98e2bd3089c812c4278974a560d
parent bf34f4922d5fcd1aafee3807718e83d8fb7a34c8
parent 3da4c44d73fa038c3f24ac1a25395469d4a91394
author TreeHugger Robot <treehugger-gerrit@google.com> 1494267629 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494267635 +0000

Merge "Night display status restored until valid state" into oc-dev