Merge commit '1d390e7f9e0eda7b5ae280493bc604b5bb99a8f2' into eclair-plus-aosp * commit '1d390e7f9e0eda7b5ae280493bc604b5bb99a8f2': Fix adapter name change problem.
Merge commit '1d390e7f9e0eda7b5ae280493bc604b5bb99a8f2' into eclair-plus-aosp * commit '1d390e7f9e0eda7b5ae280493bc604b5bb99a8f2': Fix adapter name change problem.