diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-03-21 03:10:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 03:10:30 +0000 |
| commit | c84b4d7ff20c21aa3658c81c18546a74921be441 (patch) | |
| tree | bff28f6c18b4d1f3b25cc94332c7fb65823633cb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6890727c0dca223254a5b1edf18b11061fde67fa (diff) | |
| parent | e920322ff0c67cdd9e9682fd7c7df5221a6fb13e (diff) | |
am e920322f: am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit 'e920322ff0c67cdd9e9682fd7c7df5221a6fb13e':
Revert "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