[automerger skipped] Merge "Use public resouce in android.R package" am: c110082aef am: 18b7b7b386 am: 72f991560c am: f478bfa840 -s ours

am skip reason: Merged-In I0aafef6b9b08307c3aebce597a2dd24925c6b09a with SHA-1 41424b026b is already in history

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

Change-Id: I0248f87c6f18442cdf56552881a9944321a84f5b
This commit is contained in:
Aaron Huang
2022-01-26 15:55:51 +00:00
committed by Automerger Merge Worker

Diff Content Not Available