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)
am: 57d0423e91  -s ours

Change-Id: Ia35fcfad8e0910909c1806d95d3a8c0c33d954ff


Trivial merge