tree 7912087b5bcbd96ad558ac9a8f878f2a1df5f448
parent 3e4962bffb42f1025e34d6c853c2bd0897edb3a3
parent f4c02519aa2832655e5acb95aa790738493f4727
author Michael Butler <butlermichael@google.com> 1571353985 -0700
committer android-build-merger <android-build-merger@google.com> 1571353985 -0700

[automerger skipped] Merge changes from topic "NNAPI v1.3-aosp" am: b046c4eb2d
am: f4c02519aa -s ours
am skip reason: change_id I66247588f8e42ebd85cc95b844f2d352adc81462 with SHA1 780abb8b6d is in history

Change-Id: I6ae90b3bf4b7e67b454570813b712a3e8b7499d8