OSDN Git Service

Merge "Associate freezing display with a target display id." into oc-dev
authorBryce Lee <brycelee@google.com>
Tue, 6 Jun 2017 19:52:35 +0000 (19:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 19:52:35 +0000 (19:52 +0000)
am: 1795242288

Change-Id: I41ae908e86152f42590fc346db382419c5b0a27b


Trivial merge