OSDN Git Service

am 197d7431: Merge change I71a020a9 into eclair
authorYu Shan Emily Lau <yslau@google.com>
Thu, 29 Oct 2009 08:21:52 +0000 (01:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Oct 2009 08:21:52 +0000 (01:21 -0700)
commit7231c25d35c2755221728e3bb9afdfcbd2c67b50
treecce2731cc58f3167c445f22ead09ab72be8f24a8
parent7a1a5efe405c74c619ebba3c8925ca10c568ab28
parent197d74317c3c44ed1f5ed7f40d769aec93c288f2
am 197d7431: Merge change I71a020a9 into eclair

Merge commit '197d74317c3c44ed1f5ed7f40d769aec93c288f2' into eclair-mr2

* commit '197d74317c3c44ed1f5ed7f40d769aec93c288f2':
  Fixed the flakiness of the music power test.