diff options
author | Mike Lockwood <lockwood@android.com> | 2011-03-20 17:49:21 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-20 17:49:21 -0700 |
commit | 35fb9ea84db148251973e1266904fd0949a6b2b1 (patch) | |
tree | 4f79d122b0d8ac692ffa06683a32633f2af34aef /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 433567b57c96525fb6c1c39e8ccb9780548441ba (diff) | |
parent | 9a612b545e2c5249bfd8ef2b7673197b8f214cbd (diff) |
am 9a612b54: (-s ours) am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
* commit '9a612b545e2c5249bfd8ef2b7673197b8f214cbd':
DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions