| commit | cede72579525bf182214db05defb88c22bee767a | [log] [tgz] |
|---|---|---|
| author | Kholoud Mohamed <kholoudm@google.com> | Wed Mar 31 12:06:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 31 12:06:44 2021 +0000 |
| tree | 94ab53fd1a354f436125ac8b64c81f41f58a006f | |
| parent | 1a737c45cc11780437ff0bec7d6373caae163342 [diff] | |
| parent | cbebf234e234b2b799660b799bec346012ba65c7 [diff] |
[automerger skipped] Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63ca am: 51a15fab3f am: cbebf234e2 -s ours am skip reason: skip tag Change-Id I8a2a49aa45704d8991e9cf3689b5259442fb1db3 with SHA-1 5e7b121444 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608093 Change-Id: Idce06f26f46d5842e657e0ec5cece709c5863e30