OSDN Git Service

am 7f75be7e: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:49:39 +0000 (08:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:49:39 +0000 (08:49 -0800)
Merge commit '7f75be7ea7027a2ad6e7564195333fd075c0b1a0' into eclair-plus-aosp

* commit '7f75be7ea7027a2ad6e7564195333fd075c0b1a0':
  android-2.1_r1 snapshot


Trivial merge