summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2010-11-18 15:10:02 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-18 15:10:02 -0800
commit3d019afcdb167a04d9c879285b448f9be1de3c67 (patch)
treefe95c5a55a9560161bf4e53637a65b6285838c82 /telephony
parent23c430ca7534671d187049ab5fd9a69700d7cb81 (diff)
parent5e5c2a199a9e44ef56c6638a52b9a9153f3d8c0d (diff)
downloadframeworks_base-3d019afcdb167a04d9c879285b448f9be1de3c67.zip
frameworks_base-3d019afcdb167a04d9c879285b448f9be1de3c67.tar.gz
frameworks_base-3d019afcdb167a04d9c879285b448f9be1de3c67.tar.bz2
am 5e5c2a19: (-s ours) am 80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread
* commit '5e5c2a199a9e44ef56c6638a52b9a9153f3d8c0d': DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem
Diffstat (limited to 'telephony')
0 files changed, 0 insertions, 0 deletions