OSDN Git Service

Merge "Merge "Multi-user and WallpaperColors" into oc-dr1-dev am: e09e5ef21b -s...
authorLucas Dupin <dupin@google.com>
Thu, 3 Aug 2017 23:22:46 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 23:22:46 +0000 (23:22 +0000)
am: 662282b2b6  -s ours

Change-Id: Ie564e491afac9ee5c05a47b6da0cf781b02e67e5


Trivial merge