commit | 021a826c4beed65195918aa8b17d9a3f97aa105b | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jul 13 00:24:54 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jul 13 00:24:54 2017 +0000 |
tree | f52a56887855baab9e8613fe7c10dc1c76d868e0 | |
parent | e0e5b011e0b91088ee1ac3c667e359fc263d4f7a [diff] | |
parent | e4f5740db739da80d41a020b721802ed0567c1f7 [diff] |
Merge changes from topic 'nci-2.0' * changes: halimpl: Removed hardcoaded routing table. Enable screen on lock for ISO-DEP Protocol.