OSDN Git Service

am c52c6021: (-s ours) DO NOT MERGE adb: Remove adbd from simulator build.
authorMike Lockwood <lockwood@android.com>
Wed, 12 Aug 2009 01:11:48 +0000 (18:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2009 01:11:48 +0000 (18:11 -0700)
Merge commit 'c52c602171cb29c4a4c38005f321cf95d50d3418'

* commit 'c52c602171cb29c4a4c38005f321cf95d50d3418':
  DO NOT MERGE adb: Remove adbd from simulator build.


Trivial merge