diff options
| author | Haibo Huang <hhb@google.com> | 2019-03-29 10:09:21 -0700 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2019-03-29 17:35:06 +0000 |
| commit | 87ad254d23c8cbcb56c3b69928bca97c3d49b0a6 (patch) | |
| tree | b051820819acd041667fed788704f5022552c7c1 /NOTICE | |
| parent | b9d45f84cb4ee9997a25291a8da76b278de2c525 (diff) | |
| parent | 40e7c05440583f229edd6b6ca05c5d97b66fcf15 (diff) | |
| download | iperf3-87ad254d23c8cbcb56c3b69928bca97c3d49b0a6.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into master
Also adds NOTICE, METADATA, MODULE_LICENSE_*
Test: NA (not build yet)
Change-Id: Ia08a651fdecc5e540c2cad218a128099c7322280
Diffstat (limited to 'NOTICE')
| l--------- | NOTICE | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -0,0 +1 @@ +LICENSE
\ No newline at end of file |