tree 78de44c6a4b66d4225501305fd43703861ece31b
parent a9bcd227b736f26211c6063aaa4fde77c9b756cc
parent 364a468962cbcf06149e4343740556261b5a9c50
author Piotr Sikora <piotrsikora@google.com> 1540266880 -0700
committer Piotr Sikora <piotrsikora@google.com> 1540266880 -0700

Merge branch 'nginx' (nginx-1.15.2).

Change-Id: If81ddbdb54b6ae218750ced0354d4515c05bfe31
Signed-off-by: Piotr Sikora <piotrsikora@google.com>