diff options
| author | Fred Chung <fchung@google.com> | 2010-10-05 23:45:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 23:45:29 -0700 |
| commit | 2bd6afed6c4f101932b73dcbc6ec80b61e718568 (patch) | |
| tree | 50a3e052e5ed3c30d2997c0f5366620524d0912c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 92d29c66f5cb69627172d21057e672eaba2eb03f (diff) | |
| parent | b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4 (diff) | |
am b50d5ede: am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
Merge commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4' into gingerbread-plus-aosp
* commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4':
Doc change: Adding new docs for Device Admin API.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions