OSDN Git Service

am b3a45fea: (-s ours) am 6a514dcc: am 16bf5290: (-s ours) Merge from AOSP froyo...
authorJean-Baptiste Queru <jbq@google.com>
Fri, 29 Oct 2010 15:20:09 +0000 (08:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Oct 2010 15:20:09 +0000 (08:20 -0700)
commit92a4ccaa9425d55562f54686e026f091466fb205
tree782b274efe7ba9500e89172888db64461f03c671
parent49b21018a618d1ba060f2aac4ddb9df7793c7a1e
parentb3a45feaf9f09dd60b94ef88bbc52ff7a75f39d2
am b3a45fea: (-s ours) am 6a514dcc: am 16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.

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