tree 49b3e5b9b4271483c9b0368ed279bdb2ec8362ca
parent 565a5e24af42e9c93a11af8d80413278455c233a
parent c323a8f3b21070c13118a9b039ad66d184fe6db2
author Irfan Sheriff <isheriff@google.com> 1329270810 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1329270810 -0800

Merge "Disable wi-fi direct"