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
tree: ebd08c379454e3064eb73207d60147d16406c2ad
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE