tree ce24b7a5b5513a8b167f6df285206cfc8916e4bd
parent 77357c7f65b043af79164ee16d526e870db8cccd
author Christoffer Quist Adamsen <christofferqa@google.com> 1606376398 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> 1606376438 +0000

Version 2.1.85

This version fixes a problem in the conflict resolution from cherry-picking 14522eddb6c5f8812efed66840ddce3b098f9e60 in 2.1.84.

Bug: 174167294
Change-Id: Ibb433f86284b2ef284eaab74edfcd506f5b4f314