[automerger skipped] Merge "Mark version_defaults as readonly" am: eec144223a

am: b288560ae5  -s ours

Change-Id: I95e77051f87f090a01cfdab64ebbe4a7b9899b90
This commit is contained in:
Dan Willemsen 2018-04-16 20:18:13 -07:00 committed by android-build-merger
commit cd91406e1d

Diff Content Not Available