Gloria Wang 2da9eb7175 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

..

java

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

jni

Merge changes I9fb59763,I8b2c6e00

2011-06-28 12:55:03 -07:00

res

Merge "Updated Action Bar up affordance and menu button, refresh of ic_menu from designer tree Adding all xhdpi versions of these assets as well."

2011-07-06 08:04:06 -07:00

tests

Add charCount heuristic to TextView textDirection

2011-07-01 14:08:19 -07:00