tree daf8439c90d779561243ecfe1fc9e0370c23dd0a
parent 8e18ca5c79675523671a5ebc07fbf46f65a362e6
parent 6f8363aea23c9187bf56d999741beb9f235c5021
author Lucas Dupin <dupin@google.com> 1502830254 +0000
committer android-build-merger <android-build-merger@google.com> 1502830254 +0000

Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev am: 3d141421f8
am: 6f8363aea2

Change-Id: I7b6e15910762f9f7ef2b3576778e3f00fc7dd5cd