diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-01 17:54:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 17:54:33 +0000 |
| commit | 8a911ea8e838464f6b7d197c414e7f7f9a84ae58 (patch) | |
| tree | 00908f8d3fc949f950066975bc164d366300d9ae /rs/java/android/renderscript/Program.java | |
| parent | c57692e30d6292ea40809acbd5e13f8e489baafe (diff) | |
| parent | 2b38a45bf37846d0a210369e41efd70738e3d591 (diff) | |
am 2b38a45b: am 44ffe9cb: am cba2c596: am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
* commit '2b38a45bf37846d0a210369e41efd70738e3d591':
Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions