commit | 6db53bc1cfba9758e0760f8daf7939c8eb881442 | [log] [tgz] |
---|---|---|
author | Michael Butler <butlermichael@google.com> | Tue Mar 06 00:58:34 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Mar 06 00:58:34 2018 +0000 |
tree | 03cc1eb9f1431725a3db12d441fdbce9b5f5bfb9 | |
parent | 021e96aea041659471ef5daf6b539a449dc2e3de [diff] | |
parent | 7df64ea2fd8c8e501ac1ba5cb05def96f8a8d49e [diff] |
Merge changes from topic "cp_nnapi" am: 7df64ea2fd Change-Id: I8028dc7c900d7b4187eb8a50f98ad71723ccd310