diff options
| author | Mike LeBeau <mlebeau@android.com> | 2010-09-08 17:49:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 17:49:34 -0700 |
| commit | eccea3c1118e2e66c6435e871b0f61b64e5dbe39 (patch) | |
| tree | 5625a7b7cb55d7110ae1f6ede1b8ad61f532447e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a74b0065dfee20b620c7a7f4fcfd8d40569b62f2 (diff) | |
| parent | 7d8f43d61517b976def2476d0a9ba3e5fa4c7dfc (diff) | |
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
Merge commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9'
* commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9':
Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions