OSDN Git Service

am 4226ff3e: am 8842cfe4: Merge change Ic77859c7 into eclair
authorBrett Chabot <brettchabot@android.com>
Tue, 13 Oct 2009 23:52:21 +0000 (16:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Oct 2009 23:52:21 +0000 (16:52 -0700)
commit2ad9decdb92603466085f5a8176059952f924cc0
tree0adbea448d6507f286fc5580f7f7d41d969ada2e
parent4de4521fe9d699bdd32819dc3a350ec09c253959
parent1a6f2369d271a9589e24228a06f86daf1649297c
am 4226ff3e: am 8842cfe4: Merge change Ic77859c7 into eclair

Merge commit '4226ff3e30571af63aaf1548305af35607198b5c'

* commit '4226ff3e30571af63aaf1548305af35607198b5c':
  Remove flaky ApiDemos tests from continuous.