tree e86d27ab0c6a9e278377f98d2c9d8724bd522acf
parent adc39bbb7f8ae6bd06f3d83debb8f176661583d7
parent a77a040e3164b7c792187c545e60543f998384b3
author Lucas Dupin <dupin@google.com> 1563474599 -0700
committer android-build-merger <android-build-merger@google.com> 1563474599 -0700

[automerger skipped] Merge "Do not animate wallpaper when wakeAndUnlock" into qt-dev am: 39fc29c72a -s ours
am: a77a040e31 -s ours
am skip reason: change_id I46574609a00712bdde5a4652ab5c9b0c04cbeeec with SHA1 bd6c92b074 is in history

Change-Id: I71a12b7678cc47da4af5964434b5be0e4d9fd823