OSDN Git Service

am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair
authorBrett Chabot <brettchabot@android.com>
Wed, 4 Nov 2009 21:23:28 +0000 (13:23 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Nov 2009 21:23:28 +0000 (13:23 -0800)
commitdcef5348f4457b20bcf29b8754a07160ea572372
tree5b367b1319312d294915645396b6e82f9cdb1d7f
parentbd38397bc4f754c040d4abf5435c2469c3357924
parent8742696b0d74f5dc45093d524d12fbb8abb76fa4
am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair

Merge commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp

* commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles