tree 987307c5a335e67e9dc8db9f6bc757a8e0a8f553
parent 8733f3bacd6a79009516f060eb05ad03abc74105
author Nrithya Kanakasabapathy <nrithya@google.com> 1613003709 -0800
committer Nrithya Kanakasabapathy <nrithya@google.com> 1613003709 -0800

Merge branch 'whitechapel' into android-gs-pixel-mainline

* darwinn-2.0:
  edgetpu: abrolhos: add missing new lines
  edgetpu: update objects in Makefile

Change-Id: Iea670eb8445642c6eba45664545ad2ea6d2f0e52