tree 84ff6eaf6e7c3a23ff393e84bae49cd6d2ce21ec
parent bfb2f7bf024318adff8997c2b7a40d7f354872ff
parent faa0048565b5a067a0290364ddf205ac594d2c44
author Rico Wind <ricow@google.com> 1527759731 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1527759731 +0000

Merge "Temporarily disable -adaptresourcefilecontents in gmscore tests"