diff options
author | Hung-ying Tyan <tyanh@google.com> | 2010-08-10 20:50:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 20:50:40 -0700 |
commit | 9a025349dc5a4e699fbe99a714f523e9903fa534 (patch) | |
tree | 25f4856caf7a07854c9bd7a1a7dbd83cc79aa526 /graphics/java/android/renderscript/ProgramStore.java | |
parent | 2c9de2b9e5568c8918b36866d3cf20833a8c20e1 (diff) | |
parent | 091c5238a00ca51dc69b8b09459e6ac88e1eb077 (diff) |
am 091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Merge commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077' into gingerbread-plus-aosp
* commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077':
SipAudioCall: perform local ops before network op in endCall()
Diffstat (limited to 'graphics/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions