summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-08-24 23:59:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 23:59:28 -0700
commit73497e9200e9db653cae56c631db55c133915f10 (patch)
treebdfc9025daa8ee112e1d6accf1e715676557443f /core/java/android/provider
parent2251894743f9e7b1ca7f546369c2ba7fc3d28e1f (diff)
parent37f709aeb0424948a8f69577c6fad39dc95d7733 (diff)
downloadframeworks_base-73497e9200e9db653cae56c631db55c133915f10.zip
frameworks_base-73497e9200e9db653cae56c631db55c133915f10.tar.gz
frameworks_base-73497e9200e9db653cae56c631db55c133915f10.tar.bz2
am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Merge commit '37f709aeb0424948a8f69577c6fad39dc95d7733' into gingerbread-plus-aosp * commit '37f709aeb0424948a8f69577c6fad39dc95d7733': SipProfile: add isOutgoingCallAllowed() and new builder constructor
Diffstat (limited to 'core/java/android/provider')
0 files changed, 0 insertions, 0 deletions