OSDN Git Service

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

Change-Id: I384de2479a69df5a6463586d87eb3cd5b2eebcbe


Trivial merge