commit | 916bdcc047036acc5dbaf9b9073869c203a8a4f5 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Apr 06 10:49:56 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 06 10:49:56 2020 +0000 |
tree | 4449f7dcac0e5f1863e1b996eac3e6ecc57252f1 | |
parent | 6c6be33488c2303622013843f81c3e088d1abc41 [diff] | |
parent | 3ba0b4e58c0d206cd9fed1c2c1e17565e7adf1ff [diff] |
Merge "Support for NFCC reports different protocol with same discovery ID" am: a9d801c5c7 am: 3ba0b4e58c Change-Id: I059448f66b14c854a383aa421c60f5506eb0b574