diff options
| author | smain@google.com <smain@google.com> | 2014-11-12 17:52:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 17:52:06 +0000 |
| commit | c6bd0155a76842e39ea0bb75eca33e6e3804437c (patch) | |
| tree | e6b17886b57818414c2af426492461a13915ee19 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ca011519b61e2ae57dfe760547d7d073f7ec42f3 (diff) | |
| parent | 8d88f19bfe8ec0afb27593c0dea9b547d8c80b48 (diff) | |
am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
* commit '8d88f19bfe8ec0afb27593c0dea9b547d8c80b48':
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