OSDN Git Service

Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
authorChristopher Tate <ctate@google.com>
Thu, 29 Jun 2017 22:34:22 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 22:34:22 +0000 (22:34 +0000)
am: 2de66f7be1

Change-Id: Id453b9477272c8d10738a06626411dfda58cea74


Trivial merge