summaryrefslogtreecommitdiff
path: root/libs/rs/rsAllocation.cpp
diff options
context:
space:
mode:
author John Huang <jsh@google.com> 2010-10-18 13:44:57 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-18 13:44:57 -0700
commit085996c411b4d3878dfd97c59bfc4a17da08959b (patch)
tree94e6c57d1ac69315a25d406a021ce5ef4ae278cd /libs/rs/rsAllocation.cpp
parent3e9bcb98c4190b18d113e79ead071a86cd7ca480 (diff)
parent45bd8303fe20f20843f5a76ddf42a5ace54add58 (diff)
am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread
Merge commit '45bd8303fe20f20843f5a76ddf42a5ace54add58' into gingerbread-plus-aosp * commit '45bd8303fe20f20843f5a76ddf42a5ace54add58': Uncomment SIP/VOIP feature check in SipManager.
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
0 files changed, 0 insertions, 0 deletions