| commit | c3ef5269d0c1853da32708b3c980811e1fa91471 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Oct 14 12:08:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 14 12:08:44 2020 +0000 |
| tree | 8be2da294e9acd5d6ea15b97784122dbc7e4f52e | |
| parent | 988771ed1d3a6bb9b7d48c4676b47d774b2c2249 [diff] | |
| parent | 9ed7a74518eeac4d71e22c4c875d3e14a3264e81 [diff] |
[automerger skipped] Merge "Fix storing the wrong value of mLockdown in setting" am: 59ce8cd45c am: 2099fa5a9d -s ours am: 9ed7a74518 -s ours am skip reason: Change-Id Ie85a347216614b7873bfdf199165d89527ada3a8 with SHA-1 9226fc3723 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459886 Change-Id: Id10f6956414923edc008aaa2f9dc3a3f0cbd86dd