summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-09-03 22:03:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-03 22:03:08 +0000
commitf615872cb49062de9113c7c5be31d3b1d1b423af (patch)
treeecee3208585b102649c762042351e4d326e7770f /packages/SettingsLib
parent2f142ab0779c9e36c6f733d7e2e0be083f7172ac (diff)
parent0b887e579b766012c09626e7089a3fade5415ee6 (diff)
downloadframeworks_base-f615872cb49062de9113c7c5be31d3b1d1b423af.zip
frameworks_base-f615872cb49062de9113c7c5be31d3b1d1b423af.tar.gz
frameworks_base-f615872cb49062de9113c7c5be31d3b1d1b423af.tar.bz2
am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '0b887e579b766012c09626e7089a3fade5415ee6': SurfaceControl: Add colorTransform to DisplayInfo
Diffstat (limited to 'packages/SettingsLib')
0 files changed, 0 insertions, 0 deletions