tree 5c901154d363187e0ce541948b5bc9da412ba087
parent c0a0a08ee8aa85e9f6bc2688d0791d0c7c485d40
parent 529c7ea9bd2d9340898cc5be3dec60a457e9c561
author Siyamed Sinir <siyamed@google.com> 1505172346 +0000
committer android-build-merger <android-build-merger@google.com> 1505172346 +0000

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

Change-Id: I948bc394d3904a1c7e7245b539cd004ce8fccad1