tree 15b574a090863fe6af244210032caff35e90fb44
parent ddcd23c65493b389fea075f0d001e33c892478c6
parent 9f579e1f966040e0ee91fb4732fa4135e86daa0b
author Sally Yuen <sallyyuen@google.com> 1618857932 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618857932 +0000

Merge "Fixed failing testAdoptAllShellPermissions test" am: 9f579e1f96

Original change: https://android-review.googlesource.com/c/platform/cts/+/1678128

Change-Id: I27f2d433a7978664a669e9f62ea219a3da5cedd1