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)
commitb9949d299f750bc11adb87dad74dc296867df61f
tree9d11e5f9ee406798070a5cb335390147ae1dffa5
parent6bd416f0bfbecab50b17c3876a5f3657c9cf4a09
parent605cb756f865d39ec84aa29798d3cb76a299bb4a
am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo

Merge commit '6e0967b3c4561e188df72f478baf16c6627b12be' into kraken

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