tree bdb51f7dfac092336c0759bf7a0ca24574eb1c38
parent 231dc0eabddeb44c9ca31d70a89fd2ab69bdbcbb
parent bd17b313103a25fda7b5bf20ea498b6b2583f07f
author Lucas Dupin <dupin@google.com> 1499448929 +0000
committer android-build-merger <android-build-merger@google.com> 1499448929 +0000

Merge "WallpaperColors caching and synchronization" into oc-dr1-dev
am: bd17b31310

Change-Id: If36e86322bbf8573c87d84a9ec15a350bb3f60db