summaryrefslogtreecommitdiffstats
path: root/res/xml/privacy_settings.xml
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:22:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:22:33 -0800
commitb8547bf12c53107219d7de786c234f165055e754 (patch)
tree11b734d5bb8e7327700939514a68fcfdff92c0e9 /res/xml/privacy_settings.xml
parent93fd30f9c7752d0336d3b26be68abe9f85678ce1 (diff)
parent9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81 (diff)
downloadpackages_apps_Settings-b8547bf12c53107219d7de786c234f165055e754.zip
packages_apps_Settings-b8547bf12c53107219d7de786c234f165055e754.tar.gz
packages_apps_Settings-b8547bf12c53107219d7de786c234f165055e754.tar.bz2
am 9f78ffb2: am 615f8446: reconcile main tree with open-source eclair
Merge commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81' * commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81': android-2.1_r1 snapshot
Diffstat (limited to 'res/xml/privacy_settings.xml')
0 files changed, 0 insertions, 0 deletions