commit | 8f75712b7e86122555d5ea6e0cc1d90039f05f4c | [log] [tgz] |
---|---|---|
author | Patrick Rohr <prohr@google.com> | Tue Jan 12 21:04:13 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 12 21:04:13 2021 +0000 |
tree | 1329918b831d4916f87c310870b8d962af7caa1e | |
parent | ad5d753a55d0500c7a2e787cbfe87f743297cfc0 [diff] | |
parent | da388b2cb41ae1ae139e32c359113ed8a12dc525 [diff] |
Merge changes from topic "restricted-mode-cts" am: a96eeac8d6 am: 6b0836f428 am: da388b2cb4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545868 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I57f1590e333e23b22dbd38f1ce14fc15be411de6