commit | b21ba3f994375cb2925b18aa7672a327aa4c1b89 | [log] [tgz] |
---|---|---|
author | Michael Butler <butlermichael@google.com> | Tue Aug 01 23:56:01 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 01 23:56:01 2017 +0000 |
tree | e379dedd7b86563433bf3fb7be53db4018140f80 | |
parent | 4c10b46144d954b38684b215277d4b8877ecea08 [diff] | |
parent | aa956d8f19eeac8440d92df4868c3a13092ac2c9 [diff] |
Merge changes from topic 'nnapi_hal_move' into oc-mr1-dev am: 9154eae534 am: aa956d8f19 Change-Id: I78b00e39af9c92b0dd39b2abca09b78f5ac218a0