Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp * commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af': Tracking merge of dalvik-dev to gingerbread
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp * commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af': Tracking merge of dalvik-dev to gingerbread