Merge commit '59b2923c6025812154baf329d636291f55430e0e' into eclair-mr2-plus-aosp * commit '59b2923c6025812154baf329d636291f55430e0e': fixing build
Merge commit '59b2923c6025812154baf329d636291f55430e0e' into eclair-mr2-plus-aosp * commit '59b2923c6025812154baf329d636291f55430e0e': fixing build