| commit | 73593d3c6c14e21058a1d9a713ad25265675a748 | [log] [tgz] |
|---|---|---|
| author | Jim Pollock <jmpollock@google.com> | Tue Aug 18 13:18:35 2020 |
| committer | Jim Pollock <jmpollock@google.com> | Tue Aug 18 13:18:35 2020 |
| tree | 8cf325d5125bf8bcf475b18026e4a82926e7cd5d | |
| parent | ebe1486751716cd3afe9ba0abd5b956691e08d65 [diff] | |
| parent | ebca286fc39af4156163c9496a05e7645845cdd1 [diff] |
nn: git-merge upstream/master into ToT This should allow us to bring the two trees into sync, which will make future merges cleaner and retain better commit history from upstream without needing to cherry-pick individual commits. BUG=b:157855577 TEST=FEATURES=test emerge-betty aosp-frameworks-ml-nn Change-Id: I5ff36d8a49d584db0e656c24cf60c67dcefa8de2