OSDN Git Service

Merge "Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am...
authorTony Mak <tonymak@google.com>
Thu, 17 Aug 2017 22:47:15 +0000 (22:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Aug 2017 22:47:15 +0000 (22:47 +0000)
commite1cb30b34f3107237690473385db5c5d35338f49
tree747fa9a0c29f67dee55654ad761bd020af9d79c6
parenta3ff44a38e30fd2782d97412e7a12d788bbd07ca
parent44503ab31315c4ee9b8bb5b2ae937ad67d9c8cc5
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-dr1-dev-plus-aosp
am: 44503ab313  -s ours

Change-Id: I2dc1e3b819f3400613af1ed7827e129a5d5bff54