commit | 821261cd07f5f961bb59d5babaf6022df37460cf | [log] [tgz] |
---|---|---|
author | Mika Raento <mikie@google.com> | Thu Apr 26 11:20:37 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 26 11:20:37 2018 -0700 |
tree | a09a69b2736de9f992c37cad99e8ae8ed697fc58 | |
parent | 6e1998072ce1669258821d2912da8647fa08f3f2 [diff] | |
parent | 3faf94f388d42b2316fd4dbd386a0f7b72f5915f [diff] |
Merge "Systrace support for NNAPI" am: b05c8a4d80 am: 3faf94f388 Change-Id: Ief7a99c36bb8d8bbe48c781d165b670e0b1ba0cf