diff options
| author | Andreas Huber <andih@google.com> | 2012-12-06 08:06:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-06 08:06:17 -0800 |
| commit | bb2985aa0e3435a4a945233eebc9ea36769209d2 (patch) | |
| tree | 24f6f50a3cf4ecbc719b3cb7d11333edca4ee40c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 09329186eaf66b6c03d0ff5cc8df910800649b7d (diff) | |
| parent | 683028ca0dab7b5cf7afff4501c2372350231bae (diff) | |
am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev
* commit '683028ca0dab7b5cf7afff4501c2372350231bae':
Make it clear that non-optional MediaFormat keys are required
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions