OSDN Git Service

Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev
authorAdam Lesinski <adamlesinski@google.com>
Tue, 18 Oct 2016 22:55:17 +0000 (22:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Oct 2016 22:55:17 +0000 (22:55 +0000)
am: 0858d08a88

Change-Id: Idc8f2c1685c11d301d9fb4323a21e6d14c4ae594


Trivial merge