Merge commit 'a25c9b280e3d14e5c8b443b1592d2ab6069efdc3' into eclair-plus-aosp * commit 'a25c9b280e3d14e5c8b443b1592d2ab6069efdc3': Remove unused type attribute.
Merge commit 'a25c9b280e3d14e5c8b443b1592d2ab6069efdc3' into eclair-plus-aosp * commit 'a25c9b280e3d14e5c8b443b1592d2ab6069efdc3': Remove unused type attribute.