From: Jerry Zhang <zhangjerry@google.com>
Date: Fri, 12 Jan 2018 02:22:34 +0000 (+0000)
Subject: Merge "DO NOT MERGE: Add ScreenObserver" am: 68ad3d119c  -s ours am: da57c7d0e9
X-Git-Tag: android-x86-9.0-r1~265^2~60
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=da6e6356d7cd08fadd1b3b16b7f588ea87e5084f;p=android-x86%2Fframeworks-base.git

Merge "DO NOT MERGE: Add ScreenObserver" am: 68ad3d119c  -s ours am: da57c7d0e9
am: 6a233cce6f  -s ours

Change-Id: I7ed8f8fec7885d7f8a353d0120a05bbd7da85a1e
---

da6e6356d7cd08fadd1b3b16b7f588ea87e5084f