OSDN Git Service

Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev
authorChristine Franks <christyfranks@google.com>
Wed, 25 Oct 2017 20:28:07 +0000 (20:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Oct 2017 20:28:07 +0000 (20:28 +0000)
commit10e9bc5ba78f5e6fd138e6ee752b2d2b3589d747
tree53e7a46d37b99cd6c8055328be95f9ce529af525
parenta44a9d8b98ba29d9841c21ff148a7362e50c15ee
parent2d110e68299b3b1c747a458876325b7374249b3b
Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev
am: 2d110e6829

Change-Id: I0e805b480a3317548c219eb282fcf399b41b4ff1
core/java/android/provider/Settings.java
core/res/res/values/config.xml
core/res/res/values/symbols.xml