tree 9c1f5e98951a604a9958a7d0ff4917c11b9bf2a6
parent 85e70101386ea380e29aed12d449f9f89f25d6e1
parent 8e258a182bb3d21390c2dc14f22d1cef7da37ddb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583922301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583922301 +0000

[automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc54 am: 2e254bb81e -s ours am: fb0419e165 -s ours am: 0361dab3d8 -s ours am: 8e258a182b -s ours

am skip reason: Change-Id I60732f430256d37cb926d08d093581f051c4afed with SHA-1 da78af4d66 is in history

Change-Id: I906a47317135f61899f3f40b20d32cb25e0b0152