tree 145ca55f40337b6dea99f0d59ff7ced0ffc86997
parent 6d5c9de640ab0c3e25d5d51d496465dc8ebbf84e
parent 1228803cde9fa6bbcf69880aab74d2787ddb7f58
author Justin Klaassen <justinklaassen@google.com> 1468014383 +0000
committer android-build-merger <android-build-merger@google.com> 1468014383 +0000

Merge \\"Add Night display feature\\" into nyc-mr1-dev am: 76262b8e14
am: 1228803cde

Change-Id: I855bf48a271b15f671957b1451caab24d08d8293