diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-24 12:58:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 12:58:22 -0700 |
| commit | 63134b3aee2143c6df1ae9e2f8e4d516e26a0e2a (patch) | |
| tree | 6f3cdb8117c36cb301b3bd3b75aae7d2f72eb0f5 /graphics/java/android/renderscript/ProgramRaster.java | |
| parent | 527ed66d413e293f82cf3c5c6a4adb8d09337f86 (diff) | |
| parent | 1537637cc443a48e9afb8091b6f2ce329318f2d7 (diff) | |
am 1537637c: am 3294d44b: Add confcall management to SIP calls
Merge commit '1537637cc443a48e9afb8091b6f2ce329318f2d7'
* commit '1537637cc443a48e9afb8091b6f2ce329318f2d7':
Add confcall management to SIP calls
Diffstat (limited to 'graphics/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions