Merge "Fix warning when building with GCC 5."
authorJames Zern <jzern@google.com>
Mon, 3 Oct 2016 22:42:51 +0000 (22:42 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 3 Oct 2016 22:42:52 +0000 (22:42 +0000)
commitfb020805f951b56e55ed58cff70e9824501d92ff
tree3edca1103dd6285fe3c15606c4c0ae71b382cdc9
parentc6bc7499d9378b79eabf405209f1ad7696328f42
parent0dc12b4a1c926a5281743ec57371d0733fc18446
Merge "Fix warning when building with GCC 5."