tree 20bc94b76a61b936fb29591383e598bd2f9313f0
parent 0eee5365c57d63be351690d4294834483987afe9
parent 9800811ccbbda27f4e2c7ada6fd8bc0123990fd3
author Glen Kuhne <kuh@google.com> 1495233354 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1495233361 +0000

Merge "P2P: Fix onServiceDiscovery callback param parsing" into oc-dev