tree 112dbc5ab0f066d24d33447ffc1c2c1cdc837d41
parent 3210d983b059700e6a0db8f7f51ff00bbf43527b
parent 5c1451f87b52676e0e6d051fe2fcb0f7b8d568d8
author Kelvin Zhang <zhangkelvin@google.com> 1608047903 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608047903 +0000

Remove cros specific bits from aosp am: 5c1451f87b

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1512483

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7e63ccacf982ec083f35b7170887f9efb98e3b8