diff options
| author | Craig Lafayette <craiglafa@google.com> | 2015-06-29 12:53:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-29 12:53:49 +0000 |
| commit | e3c6c095c69b30b8367bf9f50e337044632c1ce5 (patch) | |
| tree | 966e2a7d6c3d0956d626b2ff21edb5b95187e5d3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 02a63609895f21f9c4eef364b1bc9ee2f9cedbc7 (diff) | |
| parent | bee7245c69cd3d3c1404f35299c3867d1b8525f5 (diff) | |
am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev
* commit 'bee7245c69cd3d3c1404f35299c3867d1b8525f5':
Hide MIME_TYPE_PROVISIONING_NFC_V2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions