OSDN Git Service

Merge \"Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into...
authorAdam Lesinski <adamlesinski@google.com>
Wed, 22 Jun 2016 21:23:37 +0000 (21:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 21:23:37 +0000 (21:23 +0000)
commitf4dc0c9f7341c2d5797b051d8d284d6bc61620ba
tree4904156e88710533a6fc8b0c97f5aebd08ac4ed1
parentb5c8a98b7641c7f339393f69a29415242b7f9fd0
parentf64d010e5621f6504429e3e9d3317a14a795b8e4
Merge \"Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: e894efa9b6\" into nyc-mr1-dev-plus-aosp
am: f64d010e56

Change-Id: I615fb4a37374493b26efdbe7d8a5cb22dab84855