tree 643689de11620d2b8a47ef73ed0aa589d2aa67d3
parent 424646cb4dc5ea1ee1e562e077e451177983a5b3
parent 73eb38e1191ea1a3cea0ccaffb0cb11b87b224da
author Treehugger Robot <treehugger-gerrit@google.com> 1612590014 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612590014 +0000

Merge "[Mainline] Core Platform APIs migration" am: 39338deffe am: 73eb38e119

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9075b5338d14a939bedb13fcb57fe4ee527d990