tree e794bb984e6a3deec33cffd774e98c36cc1a9e7a
parent 6990092f7c3091b2e876e923c33848bca761af83
parent 8a4157206df48bb4855273096a6d7eac2f54b24f
author Dmitry Shmidt <dimitrysh@google.com> 1384805256 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384805256 +0000

Merge "Android: Remove #ifdef ANDROID_P2P from wps_registrar_remove_pbc_session"