tree 6202a5b65574f5c7e7a6bbfb9235e0371e35f099
parent d1593ccdd2992123cc82d7cf943bc8bbae1ebe3a
parent a38d157114a1b70641cbb41c85782c9eb88ddec4
author Steven Moreland <smoreland@google.com> 1480556890 +0000
committer android-build-merger <android-build-merger@google.com> 1480556890 +0000

Merge "Wifi: don't require C++11." am: 13be232d7b am: bc21d07f42
am: a38d157114

Change-Id: If3e5cce5bc9b07f4ddf41e99f743fec84e46720e