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