diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-26 17:57:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-26 17:57:16 -0700 |
| commit | 098e0edbe6afd57eecef7c033035894db5b65b99 (patch) | |
| tree | dbd1b3d33dc15d8399eab55f734d6ec72c3cc10e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f4d987893a13212dae7c4bca584a2b20bea9ed4b (diff) | |
| parent | dafad06e7fba5ea3dea43aebe16d5a34c34af426 (diff) | |
am dafad06e: (-s ours) am 9035e206: reconcile froyo-release into gingerbread
Merge commit 'dafad06e7fba5ea3dea43aebe16d5a34c34af426'
* commit 'dafad06e7fba5ea3dea43aebe16d5a34c34af426':
Add an option to hide the Voice Search icon.
Add BT test instrumentation for reboot tests.
DO NOT MERGE Separate utility methods into utility class.
Improve logging and flexibility of BT stress tests.
Remove @LargeTest annotations
Checkin initial bluetooth stress tests.
Change CDMAPhone.getDeviceId to return MEID or ESN.
Make the default backup configuration "disabled; local transport selected"
make android_id random seed depend on time as well as ro.serialno
Continue trying to make the turn off quickly after call feature work.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions