tree f1590eb6b4e25feb86887484cbf2ee01072b4a9d
parent a79733b0d009885eb1ef3915636119a8e78a0c4a
parent fcb19a8c961227bb3a38d5f58a5c62cee1e8c0b0
author Xusong Wang <xusongw@google.com> 1545180885 -0800
committer android-build-merger <android-build-merger@google.com> 1545180885 -0800

[automerger skipped] Merge changes from topics "nn_hal_fp16", "comparison_ops" am: f771d0f183 am: ecbee9fbdc
am: fcb19a8c96  -s ours

Change-Id: I69358a3e75aa4f8ef691abe559a3cbc670c4e453