diff options
| author | Martijn Coenen <maco@google.com> | 2012-11-30 11:14:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 11:14:05 -0800 |
| commit | d5dcb6d4e9ffcaf5d74b89a3bcd5f2dab6d09f9f (patch) | |
| tree | 78ceaee4e6025ac15a031695cbcf6e8735bfe10e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0f6f21026451f516a0179ae4f13bcdfcb0fd19a9 (diff) | |
| parent | 1b3a4362a08d816d78fdbb04ef115b31c8674420 (diff) | |
am 1b3a4362: am f77445cd: am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
* commit '1b3a4362a08d816d78fdbb04ef115b31c8674420':
Allow the NFC process to call Bluetooth APIs.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions