tree bc31e779ae5df524483b8878a8ba05083b794b3f
parent 41c2ff7b7ac3359157771fc076f03a45e70b50fe
parent 38b21bca73c402f0e440e381929b39a2371cd186
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579298432 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579298432 +0000

[automerger skipped] Merge "Merge "Move the app to /system_ext" am: c8e4d7953e" into stage-aosp-master am: 38b21bca73 -s ours
am skip reason: Change-Id Icd2f7fc7021e84fad9980d58688dc640ca4245f8 with SHA-1 13aaa6ab4e is in history

Change-Id: Id6961509a549a849f473c6169d92f4497db8e117