tree 2d01b7f66f059c39a5c0cf1fbc5340415a93f0ba
parent ee25eb58aac8fded3927c0343eaa367f66c8b79d
parent f2e0d7bb788ff04ebbe1ece2ecb806cbcf66fffd
author Android (Google) Code Review <android-gerrit@google.com> 1254181648 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 1254181648 -0400

Merge change I228d52db into eclair

* changes:
  Three changes.