diff options
| author | Leon Scroggins III <scroggo@google.com> | 2010-09-14 10:26:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 10:26:44 -0700 |
| commit | 720d5985f5d31912c97b7e549230d241e58c1298 (patch) | |
| tree | 06a9b3baf1e4bf10812a55a7d2b37df0d7c4cd0c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 188a8f1b72452bc294daa2186e93771543be0478 (diff) | |
| parent | 901b7b9b17d20dc8085fb5fd3bab0f0804f3906b (diff) | |
am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp
* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
Add an option to hide the Voice Search icon.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions