tree fd22b271d1d83ce5867f0cfc7a6fd3cb9028e220
parent 6aec7470f74139aef4b2ff959c2385407aa7e4aa
parent e4f91528b68404bcfd8064ba4ba1011c2245ec0f
author David Benjamin <davidben@google.com> 1535533029 -0700
committer android-build-merger <android-build-merger@google.com> 1535533029 -0700

Merge "Update the NOTICE file from BoringSSL." am: 167fa8e5ad
am: e4f91528b6

Change-Id: Iac023eb52b044dbc8bb0b1bcbd8608066e363d81