tree 181f0b43683c49165c154cc5689bba3eeab86768
parent 9d3cb9bfc6d7a5f340d2dd8132b201b933687564
parent b097fbbff339adc2d38fe670c689f3dad69c2549
author Android (Google) Code Review <android-gerrit@google.com> 1260228439 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1260228439 -0800

Merge change Ib097fbbf into eclair

* changes:
  DO NOT MERGE  Reverting change I53e91db7.