diff options
author | Jorim Jaggi <jjaggi@google.com> | 2017-07-12 14:15:32 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-12 14:15:32 +0000 |
commit | a406ddd028d34040ce7a50cb5afba8813295cf97 (patch) | |
tree | ea2ebef1fdad6c535bbedda2febb16bfa18be5d6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a42329235832acdc6809402e7b96efd20b37e3c4 (diff) | |
parent | fb8e9add4b7a430dbaa3e5b0805727428e0a1707 (diff) |
Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev am: f33b1eda88
am: fb8e9add4b
Change-Id: I01bf252c08decae7f82ce854332c3b4a342b5ee3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions