OSDN Git Service

Merge "Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543...
authorEsteban Talavera <etalavera@google.com>
Fri, 11 Aug 2017 13:24:03 +0000 (13:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Aug 2017 13:24:03 +0000 (13:24 +0000)
am: 057da39d89  -s ours

Change-Id: Icc3fc5ff09bf66d00c4e4d1f2f633cd6bf33c26b


Trivial merge