diff options
| author | Mike LeBeau <mlebeau@android.com> | 2010-09-08 17:46:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 17:46:22 -0700 |
| commit | 573c5d5edc1f51fd026e1d0e17ab883403eeddd9 (patch) | |
| tree | ed20e63dc5aaf704eb44fa5fc0325f9eaac7e328 /libs/hwui/ProgramCache.cpp | |
| parent | e126119c3a406bc564f2549aeb1416aff112689d (diff) | |
| parent | 46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb (diff) | |
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
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
0 files changed, 0 insertions, 0 deletions