tree 2bbb2beac52115a3af3a96c1df2ed2d673990b32
parent 8cd2bee34e7456728f97fa3f2f175937f9196bb5
parent 45eb1bdf8788bc2aa537ec86bc93b3bf437d9c6e
author Glen Kuhne <kuh@google.com> 1457456014 +0000
committer android-build-merger <android-build-merger@google.com> 1457456014 +0000

Merge "Added EIDs for ERP, Supported & Extended Rates" into mm-wireless-dev
am: 45eb1bdf87

* commit '45eb1bdf8788bc2aa537ec86bc93b3bf437d9c6e':
  Added EIDs for ERP, Supported & Extended Rates