tree d789d90caba5026beb00f2114d133578ae4ac97f
parent 88c2bb4c2d46745d1dbe6fa2f5c69f816a78184e
parent 0543f9f08eb43d8aaa0645d21d7798f4e9b90fa1
author James Hawkins <jhawkins@google.com> 1456249996 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1456249996 +0000

Merge "external/gmock: Silence warnings by using the correct LOCAL_CFLAGS."