commit 7076a8e3aa635e0a1a88c400e99f5a6865ac158c
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Thu Oct 11 16:17:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 11 16:17:46 2018 +0000
tree ec489641fea10aa614c71268e84bca11727f6442
parent 19d69db7746838bdec0c5e062583b8a45af6a350
parent f03bacb6ffff8d36b2b7c439b0f801cb0eb76ec5

Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp"

* changes:
  Add 1.2 ops to OperationValidationTest.
  Divide BBOX_TRANSFORM into 2 ops.
  Fix multi-threaded bug for TRANSPOSE_CONV2D.
  Add new op TRANSPOSE_CONV_2D.
  Add new op PRELU.
  Add new op CHANNEL_SHUFFLE.
  Add new op GROUPED_CONV_2D.
  Add new op HEATMAP_MAX_KEYPOINT.
  Add new op ROI_ALIGN.
  Systrace parser: handle old systrace
  Systrace parser: handle different driver threading
  Improve systrace parser IPC statistics
  More parsing of systrace without runtime trace
  Parse incomplete systraces correctly
  Simple ION_heap size watcher/logger
  Handle thread names with spaces in systrace parser