diff options
| author | Wyatt Riley <wyattriley@google.com> | 2016-05-27 03:29:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-27 03:29:22 +0000 |
| commit | a1ad1996a8eba79887eba53911e551069ce2a3b8 (patch) | |
| tree | 7af5ab59d1624ddfdf8c538db5095014b878a108 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2bc382b4a483cb24dd0f6c34a9e82076e6b5f642 (diff) | |
| parent | 8453136b8ee7ba361d4180df75328466292c9610 (diff) | |
Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219
am: 8453136b8e
* commit '8453136b8ee7ba361d4180df75328466292c9610':
Fix Activity Transition mess-up.
Change-Id: I3904d1d8782c07f0a869243802c1e1dc8d6e49b1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions