OSDN Git Service

Merge "DO NOT MERGE: Add ScreenObserver" am: 68ad3d119c -s ours
authorJerry Zhang <zhangjerry@google.com>
Fri, 12 Jan 2018 01:48:01 +0000 (01:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 01:48:01 +0000 (01:48 +0000)
commit6a233cce6f8801dc59f27787cb75724d09b84e89
treeebafcb6a8743efba401658910c09403d6a8d8f8d
parentfbee406cac628de24d69d4bc4827abe6877b2d2b
parentda57c7d0e9b95d47a78c2544192da31499d94803
Merge "DO NOT MERGE: Add ScreenObserver" am: 68ad3d119c  -s ours
am: da57c7d0e9

Change-Id: Ifaab0c2d5265ccfd148edbc77668c67724de915e