Christopher Tate 0d95a0eefa Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev ...

am: 2de66f7be1

Change-Id: Id453b9477272c8d10738a06626411dfda58cea74

2017-06-29 22:34:22 +00:00

..

android

Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev

2017-06-29 22:34:22 +00:00

com

Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am: 564d0bf1be

2017-06-29 19:06:33 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…