diff options
| author | Daniel Lehmann <lehmannd@google.com> | 2010-10-16 08:59:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-16 08:59:54 -0700 |
| commit | b759096e91fc7be9217b0e5ba89c19590e21cc39 (patch) | |
| tree | b15d8f2509c1cc719e8152a06b6ed59d4d8dd573 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2cd55d2f6db687d7398355b76fa18105314dfcd9 (diff) | |
| parent | c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9 (diff) | |
am c61c98fd: (-s ours) am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread
Merge commit 'c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9'
* commit 'c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9':
DO NOT MERGE: Private API to pass the selected tab through QuickContacts
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions