| commit | 2308e829007ae5287755e191aa30309797989f4a | [log] [tgz] |
|---|---|---|
| author | Tony Mak <tonymak@google.com> | Tue Aug 15 22:13:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 22:13:39 2017 +0000 |
| tree | 5a0de2134686c41de56fc32ab4d55df01ba4812e | |
| parent | 5a25873cba0b6bff6fe48307cdf1fb8715c0688b [diff] | |
| parent | fd384789516bc2e4c059a568659da6f3b2f1cec0 [diff] |
Merge "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af am: 569af6584a am: 30d3df57dc am: 79ada733cc am: 2eb85eca12 am: f3589fded1 -s ours am: facc5e40fc am: 0e1976292d -s ours am: 0958d0339f -s ours am: 50b01908c8 -s ours" into oc-mr1-dev-plus-aosp am: fd38478951 -s ours Change-Id: I6d50dc9a3b6f175aa75be301ed59d70fc9dd72ea