OSDN Git Service

am fa9d8258: am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform settin...
authorJustin Harrison <astyrrian@google.com>
Sat, 19 Sep 2015 18:14:36 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 19 Sep 2015 18:14:36 +0000 (18:14 +0000)
commitc591cdd69b8aee18aaf7396e640009b773c0b285
treef9069c8852f58e0bc7f92268721704a41176d026
parent6396e0df2f1c1baf1e9454fe1ad5882c7a4d381f
parentfa9d8258d4d186c1aeaf3f79cff892d0a290e6a5
am fa9d8258: am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev

* commit 'fa9d8258d4d186c1aeaf3f79cff892d0a290e6a5':
  Add color transform setting
res/values/strings.xml
res/xml/display_settings.xml
src/com/android/settings/DisplaySettings.java