diff options
author | Matthew Xie <mattx@google.com> | 2011-12-01 13:34:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-01 13:34:18 -0800 |
commit | 6001d3ad9f5ddb5be09ec6e70b5e646cb9a0f469 (patch) | |
tree | 4fba95a9bde332fa01f799a85ca4b6d97088cb30 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0bfdd7c2927fb683b89fdd52befe643e8e069e77 (diff) | |
parent | 1a1be44c5bf1e6099d678c81ef5e9326cabcb3df (diff) |
am 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
* commit '1a1be44c5bf1e6099d678c81ef5e9326cabcb3df':
Unlink the Binder DeathRecipient when removing a Bluetooth service record
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions