tree c78afb6ee48189e2bdf65e4bbeab2274da97ee8b
parent ccc9d7f1d51f4453812ac555b72175ff50032da2
author Christoffer Quist Adamsen <christofferqa@google.com> 1539680993 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> 1539680993 +0200

Add @NeverMerge annotation for testing

Change-Id: Ia7b11b49f94e084d2c3722294a43b743728d5780