Merge commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8' into eclair-plus-aosp * commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8': fixing build
Merge commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8' into eclair-plus-aosp * commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8': fixing build