tree c1068ddb7624e537c5897d915f2b549b5a7e367f
parent 8ed99b93be79d024c373b447547d31fca480eb90
parent de6c093dccd13ffb44ce2f0a458f6c85998ac232
author Xin Li <delphij@google.com> 1614071115 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614071115 +0000

[automerger skipped] Merge ab/7061308 into stage. am: de6c093dcc -s ours

am skip reason: Change-Id I06aa72fc38ffabc20623dfe531a19c268d936b07 with SHA-1 f167cec167 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/iorap/+/13658567

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9219db2ed55d4e2d6d002de4d2af81958e59253e