tree a4e469d164af27061a7f80b8b865eed790c98f42
parent 8ab2f553bfd542920309c2bcd6661d2e886e9f2b
parent 322121511dbfe9f26ce66cfd6d71aa224b81281a
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517556795 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1517556795 +0000

Merge "Merge "Create NeuralNetworks HAL v1.1 for new OperationTypes" am: 2ea233becb am: f86e9fe9fc am: 279fb7793e"