Merge commit '5fb4cab2db174bff5e28a3a2c6f50c07e0f7a845' * commit '5fb4cab2db174bff5e28a3a2c6f50c07e0f7a845': Fix http://code.google.com/p/android/issues/detail?id=3059
Merge commit '5fb4cab2db174bff5e28a3a2c6f50c07e0f7a845' * commit '5fb4cab2db174bff5e28a3a2c6f50c07e0f7a845': Fix http://code.google.com/p/android/issues/detail?id=3059