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)
Merge commit '51ca2892bba945142be57171d4e81e836418fb56'

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


Trivial merge