Ed Heyl 747c480b0e Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev ... Conflicts: include/media/hardware/CryptoAPI.h Change-Id: I84bf34edbef000558f088bbf1d1e5b55d6217d2e		2012-07-28 09:55:54 -07:00
..
editor	Move II420ColorConverter.h to /frameworks/native/include/media/editor	2012-03-12 10:59:55 -07:00
hardware	Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE	2012-07-17 15:17:02 -07:00
openmax	Add vendor specific color format to OMX_IVCommon.h	2012-06-21 15:26:38 -07:00