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