am 94929217: am 0175e945: Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1

* commit '94929217ae3fd4c577ed8b0f0391958de95bfaec':
  Fix external bug http://code.google.com/p/android/issues/detail?id=15183