tree 914ca4cc747cdde97500dd72c8e1059e40a8110e
parent 6341b8975b7660244e1ca3003bfce5371f1fd167
parent df9eabade6a7ae6c79cb8a430d8e8591027ebd00
author Lev Proleev <levp@google.com> 1580835958 +0000
committer Lev Proleev <levp@google.com> 1581010439 +0000

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

Test: mma
Change-Id: I540fa8f9b893b63d6526da5b2330fa9f248afb76