diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-07-29 01:47:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 01:47:43 +0000 |
| commit | cdd81636e1938e7c9053648a13e6ccebd2ba9d2f (patch) | |
| tree | b419324ba1344f770758a3a63aaaba7994495522 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a720d91e5a9241510cfeaa5de0c894ddfb154a65 (diff) | |
| parent | 29bac774ccba0d696857a058f5a1fae7d5c99ba5 (diff) | |
am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '29bac774ccba0d696857a058f5a1fae7d5c99ba5':
media: fix estimateFrameRatesFor to use correct ratio
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions