OSDN Git Service

Merge "Multi-user and WallpaperColors" into oc-dr1-dev
authorLucas Dupin <dupin@google.com>
Thu, 3 Aug 2017 22:56:50 +0000 (22:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 22:56:50 +0000 (22:56 +0000)
commit57d0423e91cb7eed96f80af2f7d187c416bc25ea
tree20d9954fd3f8c0412853cdb36f3e748f24ac7baf
parent5444e9d445f7c766898666c3d51ae21d3fde9eb0
parente09e5ef21b703177cad81cfa6f38260b9f347a4b
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
am: e09e5ef21b  -s ours

Change-Id: Ib197bc342f3829e683a8cba1b2f1cb1856514b1b