Gloria Wang f0459dc807 Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager"		2011-07-06 09:22:05 -07:00
cmds	Revert "Add keychain user with special keystore access permissions"	2011-06-30 22:59:13 -07:00
include	Merge "Thread ID zero for androidSetThreadSchedulingGroup"	2011-07-05 15:08:31 -07:00
libs	Merge "Thread ID zero for androidSetThreadSchedulingGroup"	2011-07-05 15:08:31 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	fix screen on/off animation, which was flipped	2011-06-30 16:23:39 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00