OSDN Git Service

am 6e6c1ebd: (-s ours) am 02ad7fc2: Move the rev of the froyo sdk component to 2...
authorXavier Ducrohet <xav@android.com>
Wed, 26 May 2010 20:52:59 +0000 (13:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 May 2010 20:52:59 +0000 (13:52 -0700)
Merge commit '6e6c1ebd77a6a353bf2af77035c73c606311d8c3' into kraken

* commit '6e6c1ebd77a6a353bf2af77035c73c606311d8c3':
  Move the rev of the froyo sdk component to 2. Do not merge


Trivial merge