tree e01f9f998d9bc7d3b95f06f7ae2f14af191ed4e5
parent d15f2481be76fe2e949fd59b4185f7196fa4a8c1
parent 273bd3b67f8bc0446f1c873effa0c9ed6227358f
author Tony Mak <tonymak@google.com> 1503009064 +0000
committer android-build-merger <android-build-merger@google.com> 1503009064 +0000

Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am: 0c2b2d1f87  -s ours am: c9a9fcdcd3  -s ours
am: 273bd3b67f  -s ours

Change-Id: Ib1734b1826e29143bdf7b4d0d9c8acfe9f259ad7