tree dac1f9c2af6e75725178c91dc6d94c69359c261e
parent af9227e1e3f0128f61670843c6a1c7f59a3310f0
parent f3ce3549cbbcaca7abf7e24763d8aa2902d8a7ef
author Treehugger Robot <treehugger-gerrit@google.com> 1490904657 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1490904659 +0000

Merge "Temporary fixes for sizes and mangled names."