diff options
| author | Marco Nelissen <marcone@google.com> | 2013-07-30 10:28:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-30 10:28:38 -0700 |
| commit | 4d4a137bf5f861bce744c113744718066e1f214e (patch) | |
| tree | bb20decb11ec6c1ab5df5b548234103a40d42051 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e7c9482015cafbd01bfa513e60f7ab45b48ce495 (diff) | |
| parent | 51cf3661fa658d7cec6a08ed3f916ce98203027c (diff) | |
am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
* commit '51cf3661fa658d7cec6a08ed3f916ce98203027c':
MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions