diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-08-26 13:14:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-26 13:14:17 -0700 |
| commit | cf7706a83bac57b12662c7dbef294f05ef77e651 (patch) | |
| tree | 0588f3da554bbcf52b5c8a87e4491768dfddac20 /graphics/java/android/renderscript/ProgramVertex.java | |
| parent | b79c2718577422d278b063f83964881ce4207c94 (diff) | |
| parent | 4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b (diff) | |
am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b'
* commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b':
Add an API to request route to an IPv6 host.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertex.java')
0 files changed, 0 insertions, 0 deletions