[automerger skipped] Merge "Do not rename R.java package" am: 5691fb68fd am: 3d5ec16eff -s ours

Browse Source

am skip reason: Change-Id Iab30ff9d3d136fa1e5464913f8d493df22c5c1c4 with SHA-1 b4f68e73f0 is in history

Change-Id: I1433ba85431c22f6df51ac0838a2018539342365

...

This commit is contained in:

Liz Kammer

2020-05-21 20:56:00 +00:00

committed by Automerger Merge Worker

parent 7e64c40fde 3d5ec16eff

commit 59925a6bca

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