OSDN Git Service

am 51ca2892: am 8dd38d6b: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:10:49 +0000 (14:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:10:49 +0000 (14:10 -0800)
commitb74877b93cb146f23d6e0cbcce454d13417eb52c
treea41b1b6416e11aaccf1fa3773b24e25532ee81ab
parentf29ed1a8e3d1e2f41cc47adfcccad3daa942ab6a
parent51ca2892bba945142be57171d4e81e836418fb56
am 51ca2892: am 8dd38d6b: reconcile main tree with open-source eclair

Merge commit '51ca2892bba945142be57171d4e81e836418fb56'

* commit '51ca2892bba945142be57171d4e81e836418fb56':
  android-2.1_r1 snapshot