diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-09 15:50:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-09 15:50:31 -0800 |
| commit | 18d8a0748d3c42a31799e5ce7c7f4c2fd63d1896 (patch) | |
| tree | 6f42bff84e273c378237f2e354eb62800811cac4 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a1555b8fa613b6374d2453fa73ff8eb1c1dfffc3 (diff) | |
| parent | 564f12ebe409bead467eee04dfd719e97367e520 (diff) | |
am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* commit '564f12ebe409bead467eee04dfd719e97367e520':
MTP: Convert date created and modified values from seconds to milliseconds
Update USB accessory compatibility library to support new requestPermission API
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions