From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 5 Feb 2010 16:46:19 +0000 (-0800)
Subject: am 8e2734af: reconcile main tree with open-source eclair
X-Git-Tag: android-x86-2.2~3^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fa2de09c65fc50379eaffb22e71fb4b0474a3e22;hp=8e2734af47b25e9727c745d4eb7c42fef0cb19b4;p=android-x86%2Fsystem-extras.git

am 8e2734af: reconcile main tree with open-source eclair

Merge commit '8e2734af47b25e9727c745d4eb7c42fef0cb19b4' into eclair-plus-aosp

* commit '8e2734af47b25e9727c745d4eb7c42fef0cb19b4':
  android-2.1_r1 snapshot
---