OSDN Git Service

Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
authorEsteban Talavera <etalavera@google.com>
Mon, 17 Jul 2017 16:27:30 +0000 (16:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Jul 2017 16:27:30 +0000 (16:27 +0000)
am: daa1539a5e

Change-Id: I30d024c2d4e11f4e4c246b123723a00d28af78ee


Trivial merge