diff options
| author | Lajos Molnar <lajos@google.com> | 2014-11-25 22:15:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 22:15:11 +0000 |
| commit | c60a5d781a5e9f927d5971f2127cada9d213a128 (patch) | |
| tree | 3de9e6aa45761da26b185ea96912a56ace6389aa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ba94fd5e6c243c6256a1627a41aaab52a74747d6 (diff) | |
| parent | 3ed95fe2589c01e9255f4d75636fb8b0c83a01d5 (diff) | |
am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev
* commit '3ed95fe2589c01e9255f4d75636fb8b0c83a01d5':
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