tree f7d3a4383e5ad836626dd3bfec2cae7b255f29cc
parent e3692bdb67d9d3cfa0741158e8706ed7cfb30abe
parent 8cd9c1e9ad5d529bd6fad8fcb48af1fa426ecd5a
author Siyamed Sinir <siyamed@google.com> 1508425722 +0000
committer android-build-merger <android-build-merger@google.com> 1508425722 +0000

Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf  -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2 am: b614e5560e am: 1d1aac8621
am: 8cd9c1e9ad

Change-Id: I01ce4add382ac8f4ae3462b165b6e5897e68c82b