OSDN Git Service

Merge "Do not extract colors of live wallpapers." into oc-dr1-dev
authorLucas Dupin <dupin@google.com>
Fri, 30 Jun 2017 18:36:13 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Jun 2017 18:36:13 +0000 (18:36 +0000)
am: 68b8d34e94

Change-Id: Ib62c0fafc328e862f9051b9164c7c199bb1d2c90


Trivial merge