diff options
| author | Lucas Dupin <dupin@google.com> | 2019-07-18 11:30:58 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-18 11:30:58 -0700 |
| commit | 0290ed25f7d5f5e12d9009e48ea924a2e84e0812 (patch) | |
| tree | e86d27ab0c6a9e278377f98d2c9d8724bd522acf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | adc39bbb7f8ae6bd06f3d83debb8f176661583d7 (diff) | |
| parent | e8d2d5357e507d433a89e1e757ba1d81c594942c (diff) | |
[automerger skipped] Merge "Do not animate wallpaper when wakeAndUnlock" into qt-dev am: 39fc29c72a
am: e8d2d5357e -s ours
am skip reason: change_id I46574609a00712bdde5a4652ab5c9b0c04cbeeec with SHA1 bd6c92b074 is in history
Change-Id: I75d4d915766b3625df193ad15eda30149a8f4549
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions