OSDN Git Service

am 197d7431: Merge change I71a020a9 into eclair
authorYu Shan Emily Lau <yslau@google.com>
Tue, 27 Oct 2009 20:56:56 +0000 (13:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Oct 2009 20:56:56 +0000 (13:56 -0700)
commitf4f1fb1c6a08e40a0410f7c2bcaeb3828b980c1e
tree719186c5ad1dbb0642426e0ee4faeffa05fe1322
parent7c3116187af5e61593bd267b757d4b3bc96d668d
parent197d74317c3c44ed1f5ed7f40d769aec93c288f2
am 197d7431: Merge change I71a020a9 into eclair

Merge commit '197d74317c3c44ed1f5ed7f40d769aec93c288f2' into eclair-plus-aosp

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