OSDN Git Service

Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Jun 2017 01:48:14 +0000 (01:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Jun 2017 01:48:21 +0000 (01:48 +0000)

Trivial merge