diff options
author | Mike Lockwood <lockwood@google.com> | 2014-03-14 21:50:44 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 21:50:44 +0000 |
commit | c5353ce373f02b549ed9e63aa23f94ca1a726f7e (patch) | |
tree | 3ad34ce1300595872395505b48d5a8b3a4799642 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 273fe6a327de8051ac075855ceb7b33a9422c7a7 (diff) | |
parent | 685831bf8da4f89366ce16c1852f25efad046261 (diff) |
am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit '685831bf8da4f89366ce16c1852f25efad046261':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions