OSDN Git Service

Merge "Fix p2p settings NPE"
authorIrfan Sheriff <isheriff@google.com>
Sat, 10 Mar 2012 00:27:59 +0000 (16:27 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 10 Mar 2012 00:27:59 +0000 (16:27 -0800)

Trivial merge