tree dde629699256a2a0410bcdd73f47d87c8f9ffed2
parent 8271e982373673ac8131d8cc6a40ca20d3f9f8f9
parent 8155446b771e763dba9b5b3fc058ff669600d12e
author Siyamed Sinir <siyamed@google.com> 1506727685 +0000
committer android-build-merger <android-build-merger@google.com> 1506727685 +0000

Merge "Fix ClipboardService device lock check for cross profile" into oc-dev
am: 8155446b77

Change-Id: I21712b3913ab073d1e0265bc8eb73d9fa33c032c