tree 1199ea87cce6b313fc9d4a52324024314531ac4e
parent 9b8453bca8f85eb96480dd2cb9f5fd64925a91cc
parent 9e7d057d636adafd8c0ddba2a47bd5cdbd65e032
author Eric Biggers <ebiggers@google.com> 1650919389 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650919389 +0000

[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours am: 5589682f84 -s ours am: 382e2b6a55 -s ours am: 9e7d057d63 -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: I0f559d235643d6a64acfd54b85331f7763c05bb8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>