tree 54c0fdf3673da186486b04a4d2ccb7dd90a69aac
parent c0fc62791747a22b40ac45ec15b741ca4bd9169f
parent 873edfa5b4fc8abec927927ae39a88fb19f129b6
author Aaron Huang <huangaaron@google.com> 1643210913 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643210913 +0000

Merge "Use public resouce in android.R package" am: 17a9e07870 am: 873edfa5b4

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

Change-Id: I91166422527512f95475a5d66599b0509ceaf7f8