am aed3c4a5: am 8fed41c3: Merge "Don\'t inadvertantly include tests in the build...
authorSteve Howard <showard@google.com>
Mon, 21 Jun 2010 22:57:57 +0000 (15:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jun 2010 22:57:57 +0000 (15:57 -0700)
commit1c05a52856657fc25c37c508ffe74c18c3ac608c
tree004557dd9fb37bf415015ecf2a4083d71062377a
parent373e4a7613de2d0d5e13ed84c1584c4dbe49eea8
parentaed3c4a57f6040349ef9e789646305c58227c35a
am aed3c4a5: am 8fed41c3: Merge "Don\'t inadvertantly include tests in the build." into kraken

Merge commit 'aed3c4a57f6040349ef9e789646305c58227c35a' into gingerbread-plus-aosp

* commit 'aed3c4a57f6040349ef9e789646305c58227c35a':
  Don't inadvertantly include tests in the build.