diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-25 00:01:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 00:01:25 -0700 |
| commit | 96b2516496e9ad0424d99c244d82eee8af3813cd (patch) | |
| tree | 133675fbc33ed9d1542bcfb5a59817ec8cf69081 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 6615759f0c3074b8f3285bfdf0ecf9d38c45d46d (diff) | |
| parent | 73497e9200e9db653cae56c631db55c133915f10 (diff) | |
am 73497e92: am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Merge commit '73497e9200e9db653cae56c631db55c133915f10'
* commit '73497e9200e9db653cae56c631db55c133915f10':
SipProfile: add isOutgoingCallAllowed() and new builder constructor
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions