commit | 5d6b956341ee821e2c5a848430f75b4d496342e5 | [log] [tgz] |
---|---|---|
author | Yu Shan Emily Lau <yslau@google.com> | Mon Nov 28 19:55:33 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 28 19:55:33 2011 -0800 |
tree | 7b45caf7ab4d7131195a9333437f2fb061f9736e | |
parent | ac8473709efcdcbbd8830ac6c6e71d48f2cfd34a [diff] | |
parent | 4e5d3f2ca05b513640d3163155756e01ae577d54 [diff] |
am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1 * commit '4e5d3f2ca05b513640d3163155756e01ae577d54': Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.