tree 6632e425ad058453029d5fb62dbcff110df16cb8
parent 4b5833c54f97ad708a80c8317c37cf42405c2222
author Rudi Horn <rudih@google.com> 1601990259 +0000
committer Rudi Horn <rudih@google.com> 1601993465 +0000

Fix collisions between fields

Bug: 169394640
Bug: 163311975
Change-Id: Ica076f10a001597c90d569511acefee8de5a689e