diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-27 11:47:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 11:47:42 -0700 |
| commit | 5a474a2bb8bc23fcc8d05e8b9ec3f4306dd63db1 (patch) | |
| tree | c4b45a6ecaf317b28801b103bc0d9c5577b39a61 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6cf8f64be3c079ef76d708a56b55a2b7ca6dbd2f (diff) | |
| parent | 44669d31d1d5b094d7b7d3e393281440ea0c9536 (diff) | |
am 44669d31: am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Merge commit '44669d31d1d5b094d7b7d3e393281440ea0c9536'
* commit '44669d31d1d5b094d7b7d3e393281440ea0c9536':
SipAudioCall: remove SipManager dependency.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions