Merge commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp * commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4': Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Merge commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp * commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4': Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles