Mike LeBeau 573c5d5edc 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 ...

Merge commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp

* commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb':
  Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended

2010-09-08 17:46:22 -07:00

..

config

…

java

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:46:22 -07:00

jni

am 85a31767: Add support for secure views.

2010-09-08 11:55:24 -07:00

res

am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

2010-09-08 14:34:31 -07:00

tests

Revert "resolve conflicts"

2010-09-08 11:01:40 -07:00