diff options
| author | Martijn Coenen <maco@google.com> | 2019-06-07 01:43:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-07 01:43:26 -0700 |
| commit | 8eb7a6bac21701e823b5330cef28a60f766427f1 (patch) | |
| tree | fbc4a37f0df2547441e2436f4c0588208d550762 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f4b94941541102c3e6631f77b6cc800474bca614 (diff) | |
| parent | 93fe09a13cf35b9fc0e6f94bbf98b900e7d29050 (diff) | |
[automerger skipped] Merge "Reconcile binder JNI with earlier changes, removing lock." am: c4a564a10a -s ours
am: 93fe09a13c -s ours
am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1 c1493b283b is in history
Change-Id: I0dd475dd434529d919c23547925a088b81d2f5da
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions