[automerger skipped] Merge "access system resources with android.R package" am: ef77c1d67f
am: 49cd1555f3
am: bcf3f23b67
-s ours
am skip reason: Change-Id Idc10955639bce7b8e579c50af78056389d44d492 with SHA-1 740d67320a
is in history
Change-Id: Ie627993aa388b1bd2f1bc7ff3ad0907c20c6a944
This commit is contained in: