tree b8c8703c09a2eda02a83f0f2a5e1b80c38c0092b
parent 5f5a2ba6570f005e6907ae09979a0d5c305be77e
parent 2aa3bdaecf20d432ffedb3bbaad3ac7f6b715bfb
author Dmitry Shmidt <dimitrysh@google.com> 1461962510 +0000
committer android-build-merger <android-build-merger@google.com> 1461962510 +0000

Merge "wpa_supplicant_8: Add a temporary hack to work around BoringSSL incompatibility." am: 712e08b6fb
am: 2aa3bdaecf

* commit '2aa3bdaecf20d432ffedb3bbaad3ac7f6b715bfb':
  wpa_supplicant_8: Add a temporary hack to work around BoringSSL incompatibility.

Change-Id: I1ed2a5b509ab0e52983497d9245e6917dd8e22d3