Merge commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085' * commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085': Fix public bug http://code.google.com/p/android/issues/detail?id=10067
Merge commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085' * commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085': Fix public bug http://code.google.com/p/android/issues/detail?id=10067