tree cda884a4058d12a5a5fc9768fe7a46300eff7492
parent 4f0606364a3dffa88252fa9562892232904c786f
parent 6a3f0c45d1b0637f2eaef19a079e3b52183232d7
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575473921 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575473921 +0000

[automerger skipped] Merge "Removes the defunct -s flag." am: a57d559918 am: 6a3f0c45d1 -s ours
am skip reason: Change-Id I0f83173c1dcd56e94d8eaafbc082c346aa11af7f with SHA-1 bfcd339319 is in history

Change-Id: I673add3bd6093baa05511933b8ff1e9056d9e3d8