diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-15 16:47:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 16:47:22 -0700 |
| commit | bb5fb60c7cb93bdd264ca5f94e3ac79cb2993e47 (patch) | |
| tree | 711363c495347c3310d195192378be502ee6eb93 /graphics/java/android/renderscript/Script.java | |
| parent | 6545fcfd9642860389619dd5c83f6e6bfd455e5b (diff) | |
| parent | 8d9e8de2c920e8c9dc2da33410780ec739076bb9 (diff) | |
am 8d9e8de2: am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
Merge commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9'
* commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9':
SipService: send SERVER_ERROR if server doesn't provide nonce
Diffstat (limited to 'graphics/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions