diff options
| author | Wei Huang <weih@google.com> | 2011-11-09 21:51:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 21:51:04 +0000 |
| commit | fc2cc318baf2d54bee636c58eb229541961c1a44 (patch) | |
| tree | 22ac82e0e98c797aaaacf7c88fe2f55b8e7cadd5 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ea57ede544bd61fe5c5e096466e9d046dfd36b50 (diff) | |
| parent | e64022ca65e36c743eca260f05f245fe9d90f80c (diff) | |
am e64022ca: am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
* commit 'e64022ca65e36c743eca260f05f245fe9d90f80c':
Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions