diff options
author | sqian | 2017-08-01 14:21:55 -0500 |
---|---|---|
committer | sqian | 2017-08-01 14:25:53 -0500 |
commit | a6e57a9647b98c4ff7dcce3986830218e9d4200a (patch) | |
tree | 6b294c925f94e3f570e2d77a41ccbdfdbfcc1f1e /neuralnetworks/1.0/vts | |
parent | ec37054b9e369f06adb34124c1465d480c8fdc3d (diff) | |
parent | 345a396c18e61ba587bdafb15fdafbe27e0f3c82 (diff) | |
download | platform-hardware-interfaces-a6e57a9647b98c4ff7dcce3986830218e9d4200a.tar.gz platform-hardware-interfaces-a6e57a9647b98c4ff7dcce3986830218e9d4200a.tar.xz platform-hardware-interfaces-a6e57a9647b98c4ff7dcce3986830218e9d4200a.zip |
resolve merge conflicts of 345a396c to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
Merged-In: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
Diffstat (limited to 'neuralnetworks/1.0/vts')
0 files changed, 0 insertions, 0 deletions