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 | 7d8f43d61517b976def2476d0a9ba3e5fa4c7dfc (patch) | |
| tree | 9729818ea7b20b4aff7e0717c79cccaf6608f811 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6fdd49d4cad45d235601deb29cb4edd198a83ae5 (diff) | |
| parent | cfe9e734e80698603593c0661a79f347f0c80085 (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 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions