Skip to content
Commit eb59ea4c authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Use public resouce in android.R package" am:... 

[automerger skipped] Merge "Use public resouce in android.R package" am: c110082a am: 18b7b7b3 am: 72f99156 am: f478bfa8 -s ours

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

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

Change-Id: I0248f87c6f18442cdf56552881a9944321a84f5b
parents 78f3eb7a f478bfa8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment