diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-19 12:25:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 12:25:46 -0700 |
| commit | 5a67749a35bcbb70bfcc5f4c18da6a196bda33c1 (patch) | |
| tree | 5c63c26c544df50c4308a582d72b76534ef01779 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a30c88359f62391b77874b83825a6e400c5100b3 (diff) | |
| parent | 987e8d7f9748018d3fee5778645b267a9ee06ff6 (diff) | |
am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp
* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
Fix Vibrator permission CTS test broken earlier.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions