commit | 77d1ebbd7bd42d849911e680a63eec02e8b444db | [log] [tgz] |
---|---|---|
author | Yu Shan Emily Lau <yslau@google.com> | Mon Nov 28 19:55:27 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 28 19:55:27 2011 -0800 |
tree | b4c1802630b01cbd3d1af6335c465b2f00c50d8f | |
parent | 6d7bd049b02cd24429e540b764c44c8371b7d5eb [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.