tree 1ba1326bdd5e0e5257aea56a40498394f04f856c
parent 248a62077a486c7f3fe1e92b059488b62cb3e5f9
parent c70e8913a27829046580961f58db9e5e66913c9b
author Tianjie Xu <xunchang@google.com> 1614197867 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614197867 +0000

Merge "Make the new RoR atoms compile" am: c70e8913a2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc2a3248daedfb72664f25c2bb339f284ff01a7c