tree bdfd8577004e7a84686daf9c4ce328d1d9a55e8f
parent 6542e1b906a9fcc2e337b67f4d86d7f15f3fdeb8
parent 9be42558297fdf4b8788b2a4e11b58158e366507
author Elliott Hughes <enh@google.com> 1500081652 +0000
committer android-build-merger <android-build-merger@google.com> 1500081652 +0000

Merge "Allow passing filenames to generate-NOTICE.py." am: 65cebf0804 am: 18f0ad8b86
am: 9be4255829

Change-Id: Ia9b2eda7cd3a196112a8d1f9d160963c3defb376