tree 48e464d77bf0abdfe65f2dec33a4cd3e125c6510
parent bfc1d77e0b633e9e6c81aac589b15db8cbf639e7
parent 89f58e156e54615a32d5097b1b1990ddf7515752
author Lucas Dupin <dupin@google.com> 1501801823 +0000
committer android-build-merger <android-build-merger@google.com> 1501801823 +0000

Merge "Multi-user and WallpaperColors" into oc-dr1-dev am: e09e5ef21b
am: 89f58e156e  -s ours

Change-Id: I455ae6d0552232647409482479bae5a41189faa9