summaryrefslogtreecommitdiffstats
path: root/MODULE_LICENSE_APACHE2
diff options
context:
space:
mode:
authorJohn Huang <jsh@google.com>2010-10-18 13:41:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-18 13:41:04 -0700
commit45bd8303fe20f20843f5a76ddf42a5ace54add58 (patch)
tree057edc4b50707037518afff86d16fe87f3456527 /MODULE_LICENSE_APACHE2
parent382717f3eeca1a21e9756c7de42b4d31747d1675 (diff)
parenta0cdfbf5b74a92611789b7ec08a84274b9011021 (diff)
downloadframeworks_base-45bd8303fe20f20843f5a76ddf42a5ace54add58.zip
frameworks_base-45bd8303fe20f20843f5a76ddf42a5ace54add58.tar.gz
frameworks_base-45bd8303fe20f20843f5a76ddf42a5ace54add58.tar.bz2
Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread
Diffstat (limited to 'MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions