tree 6e676553cda583739f075fefe98ab008062e12f0
parent 966bd75bf7bed7d5afc6ec9f95eac3dabca151e9
parent 87b69af50c2b436541f44bfb403f6604473f0d41
author Zak Cohen <zakcohen@google.com> 1468405607 +0000
committer android-build-merger <android-build-merger@google.com> 1468405607 +0000

Merge \\"Adds a screenshot wallpaper method to WallpaperManagerService.\\" into nyc-mr1-dev am: b4d4ce31ab
am: ee2f46485e

Change-Id: Ia7b738db6f73c89e97537f9b1c0d5cb7fd161616