diff options
| author | Mike LeBeau <mlebeau@android.com> | 2010-04-01 17:50:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-01 17:50:48 -0700 |
| commit | 137d468d330d3e51a88fe26739babcdcacafe435 (patch) | |
| tree | a02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f5af832c201372acf57221079ac8132c311decea (diff) | |
| parent | c8be3a46afdaafaf44a3e706049ad140cfea6bb0 (diff) | |
am 2e1cd1cd: am e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173" into froyo
Merge commit '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1' into kraken
* commit '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1':
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions