cristianomatos/android_packages_apps_Settings — pull request #1 by JustArchi (2013-10-27 01:51:00+00:00)
Title: Settings: add Advanced Settings under Display

For use in TV-Out settings and mDNIe

Change-Id: Ib595b81a11e19f8526e532400e57f5771db09499

Conflicts:
res/xml/display_settings.xml
src/com/android/settings/DisplaySettings.java

Resolved conflicts.