Merge commit '490d5222ae985f7e606cdf503d292062c80e7328' into eclair-plus-aosp * commit '490d5222ae985f7e606cdf503d292062c80e7328': Hack to fix issue #2125365: Sports Trivia compatability with Eclair
Merge commit '490d5222ae985f7e606cdf503d292062c80e7328' into eclair-plus-aosp * commit '490d5222ae985f7e606cdf503d292062c80e7328': Hack to fix issue #2125365: Sports Trivia compatability with Eclair