diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-02-25 15:48:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-25 15:48:03 +0000 |
| commit | 6eff99494dd7b274b3b9f89c64ece6cabaff5c8e (patch) | |
| tree | 7799dfa8a6fb45b13ee39eea43abf26292e5c584 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | a6f70d8b2dc2a2d900dfaa4b3fcd0fbdffdcfb9e (diff) | |
| parent | 0fc59cd958b87d015deac63797fcbfbcec518389 (diff) | |
am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '0fc59cd958b87d015deac63797fcbfbcec518389':
UsbDeviceManager: Fix race condition entering USB accessory mode
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions