tree 4d91aeb31720891aceebb7bc10c6833079e684c2
parent f3befa9b243ff392128b33fe16ba25591fb73e1f
parent 4e252b2f997904769711b242bb37027706b08b7f
author Miao Wang <miaowang@google.com> 1537552274 -0700
committer Miao Wang <miaowang@google.com> 1537567246 -0700

Merge remote-tracking branch 'aosp/upstream-master' into rebase_tf

Bug: 116318213
Test: mm
Test: NeuralNetworksTest_static
Change-Id: I249cedf6b76acb8d5ab82c67cacf82885355853d