33460d836f
Merge commit '658bec956785e074edc4f6c9fe739c366e37be33' into gingerbread-plus-aosp * commit '658bec956785e074edc4f6c9fe739c366e37be33': SDP: remove dead code.