tree 315b85b5c80e62705c8f80c7de37d05861da2ca2
parent 1e39ade047555cb5de184c4a09adb1fe51afb735
parent 897b1e92c3fd1169e3e8ea5cea65137e7713c1fb
author Mukesh Agrawal <quiche@google.com> 1516841987 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516841987 +0000

Merge changes I72baa5ca,I0366341a

* changes:
  WifiConfiguration: deprecate WPA-1 related fields
  WifiConfiguration: deprecate WEP-related fields