OSDN Git Service

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

Change-Id: I455ae6d0552232647409482479bae5a41189faa9


Trivial merge