tree 944bdd8978d273479c7c18d6a9388aa7a0c9a578
parent 09b7c0ae16218d5c6edca0af745b2e940c26d596
parent 982f40877f5ee3f8f8029cf67189743f1d171d70
author Aaron Huang <huangaaron@google.com> 1643212551 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643212551 +0000

[automerger skipped] Merge "Use public resouce in android.R package" am: 17a9e07870 am: 873edfa5b4 am: 27a963097f am: 982f40877f -s ours

am skip reason: Merged-In I0aafef6b9b08307c3aebce597a2dd24925c6b09a with SHA-1 6acd545fe1 is already in history

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

Change-Id: I0248f87c6f18442cdf56552881a9944321a84f5b