OSDN Git Service

Merge "Allow passing filenames to generate-NOTICE.py." am: 65cebf0804 am: 18f0ad8b86
authorElliott Hughes <enh@google.com>
Sat, 15 Jul 2017 01:20:52 +0000 (01:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 15 Jul 2017 01:20:52 +0000 (01:20 +0000)
commit7b97ed787f978ef3c29d38041c224438164f8c55
treebdfd8577004e7a84686daf9c4ce328d1d9a55e8f
parent6542e1b906a9fcc2e337b67f4d86d7f15f3fdeb8
parent9be42558297fdf4b8788b2a4e11b58158e366507
Merge "Allow passing filenames to generate-NOTICE.py." am: 65cebf0804 am: 18f0ad8b86
am: 9be4255829

Change-Id: Ia9b2eda7cd3a196112a8d1f9d160963c3defb376