ref: fb020805f951b56e55ed58cff70e9824501d92ff
parent: c6bc7499d9378b79eabf405209f1ad7696328f42
parent: 0dc12b4a1c926a5281743ec57371d0733fc18446
author: James Zern <jzern@google.com>
date: Mon Oct 3 18:42:51 EDT 2016
Merge "Fix warning when building with GCC 5."