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)
commit32a67b3df357e2778a76cad68e3ae6b8b59b6071
tree518782cde017c7f89cd747be6fd0c9a10bff7a25
parent4409a951ae6d8ba2de6fe19b770901cefbf4e8a3
parenta318d1e8216670d40f3e378211891c333dd5d328
Merge "Fix p2p settings NPE"