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)
commitee7589c02ab2cf4a4169531df54595f81f0d88a0
tree90e92ad3362b4d6688035e71c9974c8c54d69431
parent409433e904f9b8a65a87274b7d5f582f0ac46e26
parentdb3d4bb8c489da99d23cd6e6713a6f1f10fb52bc
Merge "Fix p2p settings crash" into jb-dev