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