tree a9cf4079515293700f5218fe138c19c300c0b753
parent afda110a489788e514708564e95b32d930fd97a3
parent dff55807117f515ff3f8878ed268a20c1fb9e4a5
author Christopher Tate <ctate@google.com> 1417728223 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417728223 +0000

am dff55807: am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev

* commit 'dff55807117f515ff3f8878ed268a20c1fb9e4a5':
  Adjust wallpaper-restore acceptance criteria