diff options
| author | Dan Morrill <morrildl@google.com> | 2010-09-01 15:05:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 15:05:34 -0700 |
| commit | 61f1cbdd71942433ce1515b614ec3d9c259ea037 (patch) | |
| tree | 9152ec01a4c86d5d28d54709d8875982faa50957 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b4de2f997591d3ee5f1eff92fbf2d4628cee5f2c (diff) | |
| parent | a800a2efa29d88e198220753f07e7d9ff69ddd9b (diff) | |
am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp
* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
Adding a feature definition corresponding to support for Near-Field
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions