Sahil Palvia 237427a461 Updating licenses.		2017-10-18 11:03:56 -07:00
..
main/java/com/amazonaws/services/kinesis	Merge remote-tracking branch 'upstream/master' into spurious-update-fix	2017-10-18 10:45:37 -07:00
test/java	Updating licenses.	2017-10-18 11:03:56 -07:00