tree 1a61a3d2dc7a6c9e42e8209677ddc3c567ffafa8
parent dca0aa03a5c77012b5e2b1eff0df2c3161e584ab
parent ca82c97e624999ab43910b963f744d13a69cbef0
author Alexander Martinz <amartinz@shiftphones.com> 1523482892 -0700
committer android-build-merger <android-build-merger@google.com> 1523482892 -0700

Merge "WallpaperManagerCompat: correct build version check" am: 8ef0aff593
am: ca82c97e62

Change-Id: I3d9a11d55ff53e3c6a32e8f16782024006d992b7