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

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