OSDN Git Service

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

Change-Id: Icbc53b1d1c65b60dd128f4d3f3b4e59367f4a3a1


Trivial merge