OSDN Git Service

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

Change-Id: Iee95196f7015c375f9d8c92ff1950d104cf98de5


Trivial merge