commit | 45453f231240dd94fb9fe3d67cafc3130fe1daba | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Sep 11 23:25:55 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 11 23:25:55 2017 +0000 |
tree | 5c901154d363187e0ce541948b5bc9da412ba087 | |
parent | c0a0a08ee8aa85e9f6bc2688d0791d0c7c485d40 [diff] | |
parent | b4879652c66a61b8ded1b61361464185d2750f32 [diff] |
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43 am: 031e9d5cc8" into oc-mr1-dev-plus-aosp