tree 33fd213b7c25ebd4d1defe742afbdca977522816
parent 1fe61d73862926c4ec8d5acbfc3e1082e2e47f59
parent 295da73f051e1a1280284d94d800c57f163a3986
author Irfan Sheriff <isheriff@google.com> 1315606304 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315606304 -0700

Merge "Disable p2p when airplane mode is turned on"