OSDN Git Service

Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
authorAdam Lesinski <adamlesinski@google.com>
Wed, 22 Jun 2016 19:16:44 +0000 (19:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 19:16:44 +0000 (19:16 +0000)
commite894efa9b6b40865d6d5666a5d776ba4e7185156
treea1005aafb500985efe426aa43afb400d8b1391b5
parenta1489339c71c06380efbbc1cc36e6bd7f767126c
parent0bf31c3fa6263f595022d8f3addfd4d28f70db99
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am: 0bf31c3fa6

Change-Id: Id0d16d2f9d69b87d4b4c01370eeceafe329d1817
core/java/android/content/Context.java
core/java/android/view/ViewRootImpl.java