OSDN Git Service

[automerger skipped] Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into...
authorPavel Grafov <pgrafov@google.com>
Mon, 9 Jul 2018 17:54:22 +0000 (10:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Jul 2018 17:54:22 +0000 (10:54 -0700)
am: 0886bf2271  -s ours

Change-Id: I77850967d6d28f6f638bb7327def038e365c653c


Trivial merge