diff options
| author | Andreas Huber <andih@google.com> | 2012-11-30 14:28:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 14:28:14 -0800 |
| commit | 1adc5975fa293afc484cc3095f74a7b4964f6306 (patch) | |
| tree | 1b68b188fb9d04bd109f560cb1829bcab00240a4 /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | cc95712ea2eb07913d8a9964cd8266245f8c1fd6 (diff) | |
| parent | 800c8ab68d695f1b6c5332c80a32316cdca69954 (diff) | |
am 800c8ab6: am 2644494a: Merge changes I8462f040,Ie471f40f
* commit '800c8ab68d695f1b6c5332c80a32316cdca69954':
MediaCodec: Allow getting the codec info directly
MediaCodec: Allow getting the chosen component name
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions