tree 61e8f5fcdf9e23ecc69b0f6dba8fe14575cb0b33
parent 11ed32f53554412967f011c442ee290cd81b8658
parent 68a477592c6c33a5ff442b41eae2dcb6fce70384
author Christoffer Quist Adamsen <christofferqa@google.com> 1528900190 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1528900190 +0000

Merge "Update holder of fields during class merging"