diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-07-29 02:31:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 02:31:36 +0000 |
| commit | e33b7d5a957dbf2007b7c162ed5e6136964514b0 (patch) | |
| tree | ae88ef6f4166fcd9f96b6fda1f38dfb3e892bc86 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b980bff0cbfa98e232a4a8a259a5a13963b9ec25 (diff) | |
| parent | 7c86f4df7117df592ec595138af39cffb8ae688d (diff) | |
am 7c86f4df: am cdd81636: am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '7c86f4df7117df592ec595138af39cffb8ae688d':
media: fix estimateFrameRatesFor to use correct ratio
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions