commit | af6d25952a3cc72e46b9495f46d61df8ddb2bacf | [log] [tgz] |
---|---|---|
author | Miao Wang <miaowang@google.com> | Sat Sep 09 22:05:13 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Sep 09 22:05:13 2017 +0000 |
tree | 1ded0effaf9138f247fdb8139bd0a627dc1cda28 | |
parent | 13570aaa2f7aa2ac288640276bafd4c966104ad8 [diff] | |
parent | 3c7df7d717ec2f8617a36d482a3b32242f7fcd56 [diff] |
Merge "Add FusedActivationFunc enum and renamed certain operations." into oc-mr1-dev am: 9e5c908810 am: 3c7df7d717 Change-Id: I8e9ff6601c2bf2738ce86c7937e83366096d909f