tree 1d47eb0d2b8e8a791eb76bfe7f434a671204627c
parent 1ef5d4730b354843abcc1a5ebe8b53bc09ff28f9
parent c47c0789be990e6660ac9d2c56b74631a144360f
author Android (Google) Code Review <android-gerrit@google.com> 1257535394 -0500
committer Android (Google) Code Review <android-gerrit@google.com> 1257535394 -0500

Merge change I4e9fe62b into eclair

* changes:
  do not merge -- original checkin to mr2 here: