tree eaeb21bd113ec17aef738dc92fb7312eca0d7570
parent 2ebe8fee0c0cb71179b2142b990defd7045c790b
parent db27b844f4605fc968931a5e102f03867898b9a6
author Chris Tate <ctate@android.com> 1456449094 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456449096 +0000

Merge "Tidy up stale lock wallpaper state in set-both operation" into nyc-dev