OSDN Git Service

Merge "Multi-user and WallpaperColors" into oc-dr1-dev am: e09e5ef21b -s ours
authorLucas Dupin <dupin@google.com>
Thu, 3 Aug 2017 23:11:20 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 23:11:20 +0000 (23:11 +0000)
commita49bed8405e86a491476012209e67f92b9a31ac6
tree48e464d77bf0abdfe65f2dec33a4cd3e125c6510
parentbfc1d77e0b633e9e6c81aac589b15db8cbf639e7
parent57d0423e91cb7eed96f80af2f7d187c416bc25ea
Merge "Multi-user and WallpaperColors" into oc-dr1-dev am: e09e5ef21b  -s ours
am: 57d0423e91  -s ours

Change-Id: Ia35fcfad8e0910909c1806d95d3a8c0c33d954ff