OSDN Git Service

am 6a514dcc: am 16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
authorJean-Baptiste Queru <jbq@google.com>
Fri, 29 Oct 2010 15:16:49 +0000 (08:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Oct 2010 15:16:49 +0000 (08:16 -0700)
commitb3a45feaf9f09dd60b94ef88bbc52ff7a75f39d2
treed951b848b261506244b35373f0a937ad01047048
parent6e644e14cbe5e90ca869817bf91fa531403394f0
parent6a514dcc9d7d851d5cbe95ef7603d2bf0523a6a2
am 6a514dcc: am 16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.

* commit '6a514dcc9d7d851d5cbe95ef7603d2bf0523a6a2':
  CTS vm-tests now depend on hosttestlib.