tree 0037d40e25d74cefd6aacc0d08b67ba2ee78fd4c
parent 6dae4bd6850e2a3b4e63608dcf5fbafe8a146e4e
parent 51b23959830c7a349c78e85ebb1363cbf675a9ac
author Mika Raento <mikie@google.com> 1533120993 -0700
committer android-build-merger <android-build-merger@google.com> 1533120993 -0700

Merge "Update CPU implementation following tflite rebase."
am: 51b2395983

Change-Id: Ifda6ac477a442f4dc97e85da1888b657d5753a14