summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-08-25 19:28:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-25 19:28:45 -0700
commit6d92e3c9ad9deab11752944cca57107feb15bcbe (patch)
tree3a3eeae57d48831cac0d2f529467a457d242f9df /telephony
parentc3bee436205d09a45e9e0d89aca07a3731e87da3 (diff)
parent5e0d833710aaba2562f39eb8021a4289bc3bcc5a (diff)
downloadframeworks_base-6d92e3c9ad9deab11752944cca57107feb15bcbe.zip
frameworks_base-6d92e3c9ad9deab11752944cca57107feb15bcbe.tar.gz
frameworks_base-6d92e3c9ad9deab11752944cca57107feb15bcbe.tar.bz2
am 5e0d8337: am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread
Merge commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a' * commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a': Add dynamic uid info for tracking the sip service usage.
Diffstat (limited to 'telephony')
0 files changed, 0 insertions, 0 deletions