c09cea3931
Merge commit '6abea1ebc29c7bc8397f0470d57a4e485b5d4ee3' into gingerbread-plus-aosp * commit '6abea1ebc29c7bc8397f0470d57a4e485b5d4ee3': Remove fields no longer in API.