tree afb7141c812fd1ccba74b991b192241bb1140faa
parent 350f2552e4e1301ebc3b40da2e61a9d3fd5a6223
parent 4b9975671f148e05830704f54e6fdc2f1d1d9d2e
author Vinit Deshpande <vinitd@google.com> 1410330863 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410330865 +0000

Merge "Secure access to WifiScanner" into lmp-dev