OSDN Git Service

Merge "NNAPI Concurrent Query Management -- HAL and VTS update" into oc-mr1-dev
authorDavid Gross <dgross@google.com>
Sat, 2 Sep 2017 22:56:48 +0000 (22:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 2 Sep 2017 22:56:48 +0000 (22:56 +0000)

Trivial merge