OSDN Git Service

am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder...
authorYu Shan Emily Lau <yslau@google.com>
Wed, 26 May 2010 00:44:46 +0000 (17:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 May 2010 00:44:46 +0000 (17:44 -0700)
Merge commit '6e0967b3c4561e188df72f478baf16c6627b12be' into kraken

* commit '6e0967b3c4561e188df72f478baf16c6627b12be':
  Added the runtime parameters for the mediarecorder stress test.


Trivial merge