tree 49c34d291c482ca893a25998e4c9a052c699e201
parent 554be51ac882ec69726bf5873b11a140546a37d2
parent 34c42877fbcf92595264aebbbf7e1b4f00319132
author Steven Moreland <smoreland@google.com> 1499396420 +0000
committer android-build-merger <android-build-merger@google.com> 1499396420 +0000

Merge "Freeze wifi 1.1 interface." into oc-dr1-dev
am: 34c42877fb

Change-Id: I3ac62dcf6c3e84eb7bd2c332dfdf928e3c567672