OSDN Git Service

Merge "Multi-user and WallpaperColors" into oc-dr1-dev am: e09e5ef21b am: 89f58e156e...
authorLucas Dupin <dupin@google.com>
Thu, 3 Aug 2017 23:20:52 +0000 (23:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 23:20:52 +0000 (23:20 +0000)
am: 1e5f6b3285  -s ours

Change-Id: I8b6ef6cd6f516a6e8ff244f0f80de74938a8d565


Trivial merge