diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-07 07:16:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 07:16:45 -0700 |
| commit | 909a974f8e5df4b6fc2cf8de6c64633406095c6e (patch) | |
| tree | 64568066512395e0843080dc24631485a89fd4e5 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f (diff) | |
| parent | 16c29bd7f2ce147fd2f39f1f36df88d1b04a5387 (diff) | |
am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread
Merge commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387' into gingerbread-plus-aosp
* commit '16c29bd7f2ce147fd2f39f1f36df88d1b04a5387':
SIP: Fix busy authentication loop.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions