tree b13fe2c154e2f4cc2e6c1ddc52cc166b87ec140c
parent 060ced19e0c19e6e3cf0ad6aae9c1b4a985183f4
parent 3f39267a162062b6956e7500a3eaaceee0ed8719
author Christoffer Quist Adamsen <christofferqa@google.com> 1530710341 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1530710341 +0000

Merge "Avoid merging classes with native methods"