tree 271d5981a458f0e9d42348f3469de2505c0fbf4d
parent 6edf32bd8e3139df4b6e499a355e53cdfc04491d
parent dbf1544b681f2f8587322b61b5d2387f05181292
author Anton Hansson <hansson@google.com> 1620725117 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620725117 +0000

Merge "Inline two constants from CorePlatform" am: dbf1544b68

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

Change-Id: I9888625f7e797b23b1a860cb6f076a6860428f27