tree 9faf98e69533bd57c129a3fd252ad7c50fc40381
parent ff193657610f5dbeb7b76ac7ebe740c745f67154
parent 5abd1c731b08ef17d531b96b342b6267e6603df7
author Android Build Merger (Role) <android-build-merger@google.com> 1502456847 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502456847 +0000

Merge "Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3  -s ours am: b6ba151a6f  -s ours am: f4e45257c8  -s ours" into oc-mr1-dev-plus-aosp