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