diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-24 05:00:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 05:00:11 -0700 |
| commit | 1537637cc443a48e9afb8091b6f2ce329318f2d7 (patch) | |
| tree | 0943469754142d3e1c43b74d5f680a6c17a92c91 /graphics/java/android/renderscript/ProgramRaster.java | |
| parent | 2ac479faeb03daa5083d91726f7b639984617ba2 (diff) | |
| parent | 3294d44b96f63f647fba3a03604eb028e28a42bc (diff) | |
am 3294d44b: Add confcall management to SIP calls
Merge commit '3294d44b96f63f647fba3a03604eb028e28a42bc' into gingerbread-plus-aosp
* commit '3294d44b96f63f647fba3a03604eb028e28a42bc':
Add confcall management to SIP calls
Diffstat (limited to 'graphics/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions