[automerger skipped] Merge "Revert "access system resources with android.R package"" am: 6bd382b85f
am: 4644c7f0a6
-s ours am: da12a74e84
-s ours am: 4f4aa0ec07
-s ours am: 822f5915c7
-s ours
am skip reason: Change-Id Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4 with SHA-1 3e26fc0f21
is in history
Change-Id: I2f0d0845849ae2dbe3dc7df79b8a670e95422401
This commit is contained in: