OSDN Git Service

Merge "P2P: Use P2P Device ID attribute if Device Info not available"
authorIrfan Sheriff <isheriff@google.com>
Fri, 6 Apr 2012 22:38:24 +0000 (15:38 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Apr 2012 22:38:24 +0000 (15:38 -0700)
commit33fd1689363dd194839377b82e3532ee35ca8b96
tree6f7f5c19e90bfeaa2b72c0e0889ec83daaf26c69
parent40fa98b45e4e61fcf0cb9292fdf8882b0624bd35
parenta6328e341c8c1ad0deb8753fdc6f1a49d0a57a92
Merge "P2P: Use P2P Device ID attribute if Device Info not available"