From dc308af31f69ebb80e1ad54f6dfae217bea367fb Mon Sep 17 00:00:00 2001
From: Dan Bornstein <danfuzz@android.com>
Date: Thu, 6 May 2010 13:20:23 -0700
Subject: [PATCH] resolved conflicts for merge of 4ba46c7f to froyo-plus-aosp

Change-Id: Iab84d24a291e182c5f63ea95d1d50a01b8680443