tree 20b768a198003dd54df4bedb40aef28751a5d7ad
parent d388b91c5e3eecf9eea3dd6062b8f74c04bb2488
parent 2de3ae18451ff5a24726d2aa9403ea38683d06ad
author Paladox <thomasmulhall410@yahoo.com> 1553617584 +0000
committer Paladox <thomasmulhall410@yahoo.com> 1553617584 +0000

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add missing 'Gerrit-HttpModule' to BUILD

Change-Id: I3c56ad4f8a5d58cdb39f77c5d742f60a4cf6352a