diff options
| author | Lajos Molnar <lajos@google.com> | 2014-11-26 12:09:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:09:56 +0000 |
| commit | fdc9e9de0823ae9a78913051c81d2bb8dd9159e5 (patch) | |
| tree | 9d264e2010aa77ae1865a098c3b5d322b1ead27e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5ff0e5fb6b339a7dea0cbc344e88673b7a99e593 (diff) | |
| parent | d4604b4fd370fa54d94ec94e6137b093f9f3da8c (diff) | |
am d4604b4f: am c60a5d78: am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev
* commit 'd4604b4fd370fa54d94ec94e6137b093f9f3da8c':
media: add support for 160-byte image info in MediaCodec
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions