tree abcb8558a922d8dc0d8709e11254504eb7a73ab5
parent 14439a8488c4485ddcd2ced21f72b47551eb7e0d
parent e0e0d22ce97f5d73eaff3387ff857c0c935ac113
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575499334 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575499334 +0000

[automerger skipped] Merge "Move wifi-service build rules from Make to Soong." am: bb025d4428 am: e0e0d22ce9 -s ours
am skip reason: Change-Id I87b83704c33694fcc99d2d9bde4e5cad9ddd06da with SHA-1 09d08e66a0 is in history

Change-Id: I26ff88306065e7e292875b2b441f8b3ccb0214e8