tree 6d653910fe91a0d2dbc0e9002f55492a85368fb8
parent 66a1e930d1e710dc56e27dacfe1390f2cb442650
parent 6c84a6201a8319a7efd7672482fa656f8282f220
author Bob Badour <bbadour@google.com> 1587759368 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587759368 +0000

Merge "Add license type: BSD+Apache3+MIT+Boost = NOTICE" am: 6c84a6201a

Change-Id: Ie1ec3ac33d29601842b065e3ec7ed0469376441b