summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Display.java
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-01-20 16:13:29 -0800
committerThe Android Automerger <android-build@android.com>2012-01-20 16:13:29 -0800
commit73ff4af39dcca66d9f68c02fad1113634a9a4a43 (patch)
tree69c964e7fc0065633036f087fe5f512ad8daa7ed /src/com/android/settings/Display.java
parent43c9dcc18e4e1137c59b847eadde7ae27302b08f (diff)
parent76b9d3ef47ebc478213c191f00cd80fd0982fc8b (diff)
downloadpackages_apps_settings-73ff4af39dcca66d9f68c02fad1113634a9a4a43.zip
packages_apps_settings-73ff4af39dcca66d9f68c02fad1113634a9a4a43.tar.gz
packages_apps_settings-73ff4af39dcca66d9f68c02fad1113634a9a4a43.tar.bz2
merge in ics-mr1-release history after reset to ics-mr1
Diffstat (limited to 'src/com/android/settings/Display.java')
0 files changed, 0 insertions, 0 deletions