OSDN Git Service

Merge "Merge "Merge "Prevent getting data from Clipboard if device is locked" into...
authorSiyamed Sinir <siyamed@google.com>
Mon, 11 Sep 2017 23:41:10 +0000 (23:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 23:41:10 +0000 (23:41 +0000)
commitfa3da6023d98ae033e0d47566d0843d94fb0ff4e
treee2905694b9ebe7d19b4a86aa087b8908875c6741
parentffc8c4a2e0057cbd4f6c33a09fe9875c56303ce2
parent0ee5c36e7f088f8af8e9e0545ad073f3645f518d
Merge "Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43" into oc-dr1-dev-plus-aosp am: 529c7ea9bd" into oc-mr1-dev-plus-aosp
am: 0ee5c36e7f

Change-Id: I8560667a92e1c66c59d497efce11ae48790efd7c