Jeff Tinker 899d1a68b0 Merge "Add a method to associate MediaDrm session with MediaCrypto"		2015-04-10 21:04:06 +00:00
..
drm	Add expiration update and keys change events	2015-04-09 22:44:56 +00:00
editor	Move II420ColorConverter.h to /frameworks/native/include/media/editor	2012-03-12 10:59:55 -07:00
hardware	Add a method to associate MediaDrm session with MediaCrypto	2015-04-10 04:10:10 -07:00
openmax	openmax: add OMX_IndexConfigOperatingRate.	2015-04-07 12:25:30 -07:00