Merge commit '90d3f458d99d9c0f35f9ee295997661c2493cb58' into froyo-plus-aosp * commit '90d3f458d99d9c0f35f9ee295997661c2493cb58': API 8!
Merge commit '90d3f458d99d9c0f35f9ee295997661c2493cb58' into froyo-plus-aosp * commit '90d3f458d99d9c0f35f9ee295997661c2493cb58': API 8!