[automerger skipped] Merge "Revert "access system resources with android.R package"" am: 6bd382b85f am: 4644c7f0a6 -s ours am: da12a74e84 -s ours

Browse Source

am skip reason: Change-Id Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4 with SHA-1 3e26fc0f21 is in history

Change-Id: I9e1af8959b36d2721d60b7176ad62a52cc1d1b4a

...

This commit is contained in:

Daniel Bright

2020-04-06 20:45:02 +00:00

committed by Automerger Merge Worker

parent cc2157f5a9 da12a74e84

commit 4f4aa0ec07

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available