tree 13ac75ab5128f10892c1fa8ff48db3a518b3e13c
parent 52d9b1aaff20906da4443dafb18156e06a424c8f
parent 06cffc09a32298ba2634fae9f61e4e31f40258e0
author Glen Kuhne <kuh@google.com> 1497639612 +0000
committer android-build-merger <android-build-merger@google.com> 1497639612 +0000

Merge "Revert "Revert "Add 'basic rates' IE to wifi IE whitelist""" into oc-dev
am: 06cffc09a3

Change-Id: I8441f1b0d5c72b13bee72a7dc8a93b8904bc656a