tree f5bc499712709f6907b56743fb37f6a0247a8901
parent 1fd626bbad68166c6b4be628c99e16a1a88a62a3
parent 08599bc8391ab48467051dc60fc908b547cb5336
author John Spurlock <jspurlock@google.com> 1384361408 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384361408 -0800

am 08599bc8: am 4cc2655a: Merge "Update WallpaperManager CTS test." into klp-dev

* commit '08599bc8391ab48467051dc60fc908b547cb5336':
  Update WallpaperManager CTS test.