Romain Guy 9584a542e3 Merge "Purge Skia objects from GL caches as needed."

2010-09-08 18:06:11 -07:00

..

config

…

java

am 573c5d5e: am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread

2010-09-08 17:49:34 -07:00

jni

Merge "Purge Skia objects from GL caches as needed."

2010-09-08 18:06:11 -07:00

res

Merge "Added resources and styles for ActionBar tabs"

2010-09-08 16:14:47 -07:00

tests

am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp

2010-09-08 11:07:30 -07:00