diff options
| author | James Dong <jdong@google.com> | 2011-03-16 15:12:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 15:12:58 -0700 |
| commit | 1cbf8493dae7f8aed3e562a05d8d311f98c141b9 (patch) | |
| tree | 955f50907633afd242b8af76e6fbe2e2db5b8fa4 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0c4f09be5b73bd6bf19921d907fadc50d853deaf (diff) | |
| parent | 28fc2037bffd1593b56fe1e1522de544a7d49120 (diff) | |
am 28fc2037: am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
* commit '28fc2037bffd1593b56fe1e1522de544a7d49120':
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions