tree cbe1d9215e97c165c17903c43e93d49ad9327e79
parent de15958a1374fd4614ecde9d911ef0e67b11ddf7
parent e2493811e40068d67c7546aa54d7fcca3a16b5e4
author Android (Google) Code Review <android-gerrit@google.com> 1259875628 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1259875628 -0800

Merge change I74bf38a0 into eclair-mr2

* changes:
  Squashed commit of the following: