tree aba5a5cec0baa412587e1421c03126e65e8adc83
parent cad75e24371ff7d4e713d755f461f598d10af91b
parent 49bef543b304e359fd673e35f93e2c4e544168b0
author Esteban Talavera <etalavera@google.com> 1502454840 +0000
committer android-build-merger <android-build-merger@google.com> 1502454840 +0000

Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am: 49bef543b3  -s ours

Change-Id: I69369945e8fc5c1090c8ee217b5d193f5fb1236d