tree 8bb5d04424632be80320f4eaf2c12ce5d5cb6e88
parent 9f921b6b5462f53a049078382f482e34dc48e738
parent e75275f49826001c662fba8e7108e244f00edaa9
author Christoffer Quist Adamsen <christofferqa@google.com> 1529066712 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1529066712 +0000

Merge "Avoid that class merging affects field resolution"