diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-10 07:52:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-10 07:52:30 -0800 |
| commit | 84edf14b62eaf3304252bb76b0b2ca3f518c8d54 (patch) | |
| tree | 204a867b8fc4b0859bb832ac2dbccb508f781d9e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ce475995740942d75eda7af820072c765256ec73 (diff) | |
| parent | cc08c439bc7b0afbdafc5ca18c584d2f7724f3df (diff) | |
am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
* commit 'cc08c439bc7b0afbdafc5ca18c584d2f7724f3df':
UsbAccessory: Add URI string, replace type string with description
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions