OSDN Git Service

am 716747f7: am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum...
authorHong Teng <hongteng@google.com>
Tue, 15 Nov 2011 21:07:07 +0000 (13:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Nov 2011 21:07:07 +0000 (13:07 -0800)
commit5c052218128013d630b4d9a84393ebfbff11f3e8
tree8f8832b5f7505728e8cee40710aec8007f8a8290
parentc4795ecad4e5a0b3ec54862a40c82ef1ba53cd59
parente7cf4ee4462bfcfc4e99c0b059ee525da12173f8
am 716747f7: am 481ffa50: Merge "Fix for issue  5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1

* commit '716747f7cb29b45e41c2870f12d39095f4ed80c8':
  Fix for issue  5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
media/libmedia/MediaProfiles.cpp