summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-09-22 10:01:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-22 10:01:48 -0700
commit00ec86940370bdeb4b255fd5f8bb2e1da9c8ac17 (patch)
treed1b8e6d460968ecdf0297fc2f63b4a00cd3e8137 /core/java/android/preference
parentbb205456698053b1f77891ee1a94e3ddebee1f10 (diff)
parent6cec0dc0e47459553a3a6572abd28a8e49ce5875 (diff)
downloadframeworks_base-00ec86940370bdeb4b255fd5f8bb2e1da9c8ac17.zip
frameworks_base-00ec86940370bdeb4b255fd5f8bb2e1da9c8ac17.tar.gz
frameworks_base-00ec86940370bdeb4b255fd5f8bb2e1da9c8ac17.tar.bz2
am 6cec0dc0: am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Merge commit '6cec0dc0e47459553a3a6572abd28a8e49ce5875' * commit '6cec0dc0e47459553a3a6572abd28a8e49ce5875': GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
Diffstat (limited to 'core/java/android/preference')
0 files changed, 0 insertions, 0 deletions