diff options
| author | Patrick Scott <phanna@android.com> | 2010-09-24 11:36:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 11:36:51 -0700 |
| commit | 888bcdbeca34819c07d7dc06dc03d91207aea0c0 (patch) | |
| tree | 636f3993bd3c66d2d8608fe803cbf617ab517a0f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c55f6da7281d34a4b875975cdf68f5062dfe4b34 (diff) | |
| parent | 3ae249dc6a23f40cfc189ce2e25f75de32e7889a (diff) | |
am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp
* commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
Add new Alarm provider class for setting an alarm.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions