OSDN Git Service

Merge "Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d1...
authorBryce Lee <brycelee@google.com>
Tue, 13 Jun 2017 19:19:37 +0000 (19:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 19:19:37 +0000 (19:19 +0000)
am: 137d09aa07

Change-Id: I98d23f7b5d87bb09dc5287319e4f94e6236f0027


Trivial merge