ref: a6b7bd6a1cb63026180437ef97d4f17c90897a71
parent: 8910cf8d69be050dfd7be4b9cb540f97c95fcd03
parent: f45296176504475fce7b00c19aee984cfb6a7f82
author: James Zern <jzern@google.com>
date: Tue Aug 12 16:15:14 EDT 2014
Merge "fixes several -Wunused-function warnings"