summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-26 17:58:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-26 17:58:04 -0700
commit603a1f59703109c89ec0fdeceb0f8d28c7cede22 (patch)
treec965b64113aec02427d7e201aa99a46b699c9f9c /core/java/android
parentaed5d62ac1278c032528921798529dbd824a1865 (diff)
parentcc033bd367a445d5e3f8de919cd155505b25274c (diff)
downloadframeworks_base-603a1f59703109c89ec0fdeceb0f8d28c7cede22.zip
frameworks_base-603a1f59703109c89ec0fdeceb0f8d28c7cede22.tar.gz
frameworks_base-603a1f59703109c89ec0fdeceb0f8d28c7cede22.tar.bz2
am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread
Merge commit 'cc033bd367a445d5e3f8de919cd155505b25274c' into gingerbread-plus-aosp * commit 'cc033bd367a445d5e3f8de919cd155505b25274c': Fix some bugs in SettingsProvider that I introduced the other day.
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions