diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-03-21 01:14:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 01:14:12 +0000 |
| commit | aa7e396f44f9b3b12a6abc9d8d62cf3a6f17527b (patch) | |
| tree | d734e8e8614c66e84fa030cb6e69a12e8f03ecbb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f479d15814f58ed820829fef0bfadf73cb2b88aa (diff) | |
| parent | 935d417b5615a62bc521a8eb58c35de1b4fdf841 (diff) | |
am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '935d417b5615a62bc521a8eb58c35de1b4fdf841':
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