diff options
| author | smain@google.com <smain@google.com> | 2014-11-12 18:04:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 18:04:11 +0000 |
| commit | e9e96e7f0e372459372b31b138124d0760ed2689 (patch) | |
| tree | f3c9be75ac7e3a8264fe9a333cebd81af1efa98f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 68fde80a475cdfe4534378a8fdd97d2ac53c24a6 (diff) | |
| parent | 7d0d2f6c95aa01d6aa43217dec2e183403e7c514 (diff) | |
am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
* commit '7d0d2f6c95aa01d6aa43217dec2e183403e7c514':
fix code type and mention api level 21 exception for bindService()
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions