diff options
| author | Lajos Molnar <lajos@google.com> | 2015-07-17 14:01:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 14:01:39 +0000 |
| commit | 99dea349513e307081622f6d11c3b40ee3dcce82 (patch) | |
| tree | 3eb47f7eea99c542be621fe22e3b027ca8ffb7d9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 26837f1af1e9ffca64a5a65156f9c46f1ea47ef1 (diff) | |
| parent | 1eb690c20bfb8e99f37e9cf0cbd334c194a5c0ab (diff) | |
am 1eb690c2: am 9628568a: am e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev
* commit '1eb690c20bfb8e99f37e9cf0cbd334c194a5c0ab':
MediaSync: fix flush handling and deadlock
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions