| commit | da388b2cb41ae1ae139e32c359113ed8a12dc525 | [log] [tgz] |
|---|---|---|
| author | Patrick Rohr <prohr@google.com> | Tue Jan 12 20:48:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 12 20:48:25 2021 +0000 |
| tree | 7954ea950a9cb4486b3587845debe67c63492bc3 | |
| parent | 429f94a923bd4ac027a0d078fc33fea05a3f29a6 [diff] | |
| parent | 6b0836f42880878ce103a869925cda6fd23d8b2e [diff] |
Merge changes from topic "restricted-mode-cts" am: a96eeac8d6 am: 6b0836f428 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545868 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b20d406cc52bf79b3644be76505cae1c285736a