summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-08-25 10:20:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-25 10:20:08 -0700
commit9650f128b24ae339fedd697ef6525cda8c42ebd2 (patch)
treedd99783e67867287be900ca84c45bb91e8ea74b1 /core/java/android/provider
parent4200058044afd9ed0ee63b48c433fe83fda4279b (diff)
parent44b31fdd86053945e1eeb3b91783577aebd95b55 (diff)
downloadframeworks_base-9650f128b24ae339fedd697ef6525cda8c42ebd2.zip
frameworks_base-9650f128b24ae339fedd697ef6525cda8c42ebd2.tar.gz
frameworks_base-9650f128b24ae339fedd697ef6525cda8c42ebd2.tar.bz2
am 44b31fdd: am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant
Merge commit '44b31fdd86053945e1eeb3b91783577aebd95b55' * commit '44b31fdd86053945e1eeb3b91783577aebd95b55': Make the default backup configuration "disabled; local transport selected"
Diffstat (limited to 'core/java/android/provider')
0 files changed, 0 insertions, 0 deletions