tree cd170f9cd040464b88a21c890eaad5c08f877247
parent fdab116f7c02121a07371e0b23ef7147b5f7347c
parent 64034037680f3d773ec9c47616ec5c3958a22464
author Piotr Sikora <piotrsikora@google.com> 1528231578 -0700
committer Piotr Sikora <piotrsikora@google.com> 1528231578 -0700

Merge branch 'nginx' (nginx-1.15.0).

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