| commit | 58c7fa1a92cf4810fa29f87a753a78b6c40f1b7b | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Mon Apr 25 18:58:41 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 25 18:58:41 2022 +0000 |
| tree | b4ef8e32d4469ae2dad135b1891f258178801c61 | |
| parent | 3a4170de4bf5785d5d0bb1332d8ed8ae438a5970 [diff] | |
| parent | 8d8f4691df66be13982d4aa47031893676cfb39d [diff] |
[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585 Change-Id: I897abfec9e7eab4e6573b38e7e2c36758672be99 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>