summaryrefslogtreecommitdiffstats
path: root/tools/aidl/aidl_language.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-20 13:56:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-20 13:56:59 -0700
commitfd0ba81c02c0881f7534333afc8c53e241158a3d (patch)
treece3938bb4e330f32bc4553fb3991cc925467e7b4 /tools/aidl/aidl_language.cpp
parentb50187237c1bdbb805b67bbc35002b243b8a86fe (diff)
parentbaced375ba5f374445c44a2115700d69693794a0 (diff)
downloadframeworks_base-fd0ba81c02c0881f7534333afc8c53e241158a3d.zip
frameworks_base-fd0ba81c02c0881f7534333afc8c53e241158a3d.tar.gz
frameworks_base-fd0ba81c02c0881f7534333afc8c53e241158a3d.tar.bz2
am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp * commit 'baced375ba5f374445c44a2115700d69693794a0': Silently reject a ringing call when another call is dialing/ringing.
Diffstat (limited to 'tools/aidl/aidl_language.cpp')
0 files changed, 0 insertions, 0 deletions