OSDN Git Service

Merge \\"Add Night display feature\\" into nyc-mr1-dev am: 76262b8e14
authorJustin Klaassen <justinklaassen@google.com>
Fri, 8 Jul 2016 21:46:23 +0000 (21:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jul 2016 21:46:23 +0000 (21:46 +0000)
commit029c2f4e3f9be621d7f82361decbbcdabeff9861
tree145ca55f40337b6dea99f0d59ff7ced0ffc86997
parent6d5c9de640ab0c3e25d5d51d496465dc8ebbf84e
parent1228803cde9fa6bbcf69880aab74d2787ddb7f58
Merge \\"Add Night display feature\\" into nyc-mr1-dev am: 76262b8e14
am: 1228803cde

Change-Id: I855bf48a271b15f671957b1451caab24d08d8293
core/java/android/provider/Settings.java
core/res/res/values/config.xml
core/res/res/values/symbols.xml
proto/src/metrics_constants.proto
services/java/com/android/server/SystemServer.java