summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference/Preference.java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-11-28 10:40:18 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-28 10:40:18 -0800
commit7538ff0920a8cbdfe68885221d1275633eafc613 (patch)
treed61527b0e8b2ca7f865622d2aa3ad7bdda250e7b /core/java/android/preference/Preference.java
parentf0afad008bf78576ff364bcd8bc93b7aa8090b34 (diff)
parent35473e6e6d2d17c859173ca0cf0dfdcfcb0b4663 (diff)
downloadframeworks_base-7538ff0920a8cbdfe68885221d1275633eafc613.zip
frameworks_base-7538ff0920a8cbdfe68885221d1275633eafc613.tar.gz
frameworks_base-7538ff0920a8cbdfe68885221d1275633eafc613.tar.bz2
am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev
* commit '35473e6e6d2d17c859173ca0cf0dfdcfcb0b4663': docs: update dreamservice description
Diffstat (limited to 'core/java/android/preference/Preference.java')
0 files changed, 0 insertions, 0 deletions