OSDN Git Service

Merge "DO NOT MERGE: Add ScreenObserver" am: 68ad3d119c -s ours am: da57c7d0e9
authorJerry Zhang <zhangjerry@google.com>
Fri, 12 Jan 2018 02:22:34 +0000 (02:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 02:22:34 +0000 (02:22 +0000)
am: 6a233cce6f  -s ours

Change-Id: I7ed8f8fec7885d7f8a353d0120a05bbd7da85a1e


Trivial merge