Merge "Multi-user and WallpaperColors" into oc-dr1-dev

am: e09e5ef21b  -s ours

Change-Id: Ib197bc342f3829e683a8cba1b2f1cb1856514b1b
This commit is contained in:
Lucas Dupin
2017-08-03 22:56:50 +00:00
committed by android-build-merger

Diff Content Not Available