OSDN Git Service

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

Change-Id: Idb06a8e04ac1cb9bf73fe168217d5369bb412b4f


Trivial merge