OSDN Git Service

Merge "Fix p2p settings crash" into jb-dev
authorIrfan Sheriff <isheriff@google.com>
Fri, 18 May 2012 22:10:41 +0000 (15:10 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 18 May 2012 22:10:41 +0000 (15:10 -0700)

Trivial merge