diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-05-29 15:25:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-29 15:25:27 -0700 |
| commit | 429d996f649c7a6ffa12fa8a056d2fe4e6802862 (patch) | |
| tree | 88eae7a512fe39af75420c913018a0eb46677bd4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6196cfdb528d662741c68126062dd34d78641a5b (diff) | |
| parent | 57d436d4dec99fb3a73815040b40fe447c9f1a61 (diff) | |
am 57d436d4: (-s ours) am 8d25fba8: Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev
* commit '57d436d4dec99fb3a73815040b40fe447c9f1a61':
DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions