tree 747fa9a0c29f67dee55654ad761bd020af9d79c6
parent a3ff44a38e30fd2782d97412e7a12d788bbd07ca
parent 8b99c72ca7cce5130470ba7ab1d62598376b3411
author Tony Mak <tonymak@google.com> 1503010056 +0000
committer android-build-merger <android-build-merger@google.com> 1503010056 +0000

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

Change-Id: I69c823644dd730bf4cc4eee07bbb41ed1dc27604