am 2de0a50a: am a72bb404: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread

Merge commit '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1'

* commit '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
tree: a9554f044a6537d28d6e2aa58c02b3f3f2151993
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/