OSDN Git Service

am 300457ba: am 38ce5194: Merge "Enable to delete a stored persistent group from...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 28 Aug 2012 18:15:22 +0000 (11:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Aug 2012 18:15:22 +0000 (11:15 -0700)
* commit '300457bad289f547430da21e72747e8840840832':
  Enable to delete a stored persistent group from p2p settings.

1  2 
res/values/strings.xml

Simple merge