diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-10-04 08:36:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 08:36:27 -0700 |
| commit | 07fb33efe8b0cbedf518a8afa20d96d8d4bab69a (patch) | |
| tree | 84da3980dc309c5ff0951d10357a196c34903b0a /graphics/java/android/renderscript/ProgramVertex.java | |
| parent | ac7540733cafcca5bdb1842e1ebcb396ba064583 (diff) | |
| parent | d8f1a540162e16d88cae9a1e8ec58cba68adf6e2 (diff) | |
am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp
* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
Refrain warning when not appropriate. Do not merge
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertex.java')
0 files changed, 0 insertions, 0 deletions