Merge commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7' into gingerbread-plus-aosp * commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7': Fix public bug http://code.google.com/p/android/issues/detail?id=10067
Merge commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7' into gingerbread-plus-aosp * commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7': Fix public bug http://code.google.com/p/android/issues/detail?id=10067