diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2018-01-09 20:42:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-09 20:42:02 +0000 |
| commit | ea80f4c929cbb76927ef99248bf8003d9aa5b51c (patch) | |
| tree | af47e17fbda0a2e523c586e51b2741cad23cc7cb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | df86ddb3f9612444e1f08d751845f835958beb9c (diff) | |
| parent | ca37d9f3dd5db0d47472855497299d4520072c02 (diff) | |
Merge "Don't wait for NFC when shutting down." am: 5d286326b1 am: a9d1e2a922
am: ca37d9f3dd -s ours
Change-Id: Icb37e9f862a0d08531964e09158ee84265ccd83a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions