[automerger skipped] Merge "Mark version_defaults as readonly" am: eec144223a am: b288560ae5 -s ours

Browse Source

am: cd91406e1d  -s ours

Change-Id: I5201f2d9956219da0b28b7fb3d8d1a6eba87aa17

...

This commit is contained in:

Dan Willemsen 2018-04-16 20:26:50 -07:00 committed by android-build-merger

parent 4cd5938725 cd91406e1d

commit e2d4795099

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

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

Diff Content Not Available