tree 8bc595678bef3963ee79283ea8414b702f7c1cb3
parent 9a513fc6efd281f099d397ff050ad9ceb7a7b413
parent 72b835a8f68b930b090a098d7419f6dcc297d267
author Dmitry Shmidt <dimitrysh@google.com> 1472504306 +0000
committer android-build-merger <android-build-merger@google.com> 1472504306 +0000

Merge "wpa_supplicant_8: Add a temporary hack to work around BoringSSL incompatibility." am: 712e08b6fb am: 2aa3bdaecf am: e8357569ba am: f9b2a3dbfd am: 4d51d432f5 am: a39ebd3977
am: 72b835a8f6

Change-Id: I8647129890c2ccf8f862b2608f2e337da9dafb7c