| commit | 965ff5fb190987f2e671788aa036a5a7b5b1f743 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed Nov 23 14:09:00 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 23 14:09:00 2011 -0800 |
| tree | 0deedad877567f4624afb9886f645213465bd7fe | |
| parent | 682d480b49c1e0b076ed925954f3544d8255e2aa [diff] | |
| parent | 442304a15afe4ce08ae7a7c06c0be0168164e714 [diff] |
am 442304a1: (-s ours) am d2c0b7d4: am a8fe85ea: Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge. * commit '442304a15afe4ce08ae7a7c06c0be0168164e714': Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.