| commit | eb59ea4c11e5bd5f6cc885e0e9213d71b82a7fe1 | [log] [tgz] |
|---|---|---|
| author | Aaron Huang <huangaaron@google.com> | Wed Jan 26 15:55:51 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 15:55:51 2022 +0000 |
| tree | 7d568c79d75a7dcd7f04cae4f244aa6f64b099ee | |
| parent | 78f3eb7af4a3340f4dfc7db4fb0d035954dec0e5 [diff] | |
| parent | f478bfa84096a9785f7c7d41f31c60a3c0f82ffb [diff] |
[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