tree e1c9e21525348fe826b91ecee7075ccb743f843d
parent 51b3ea2b8f7298bffbd246c65a606cd053357b66
author Andreas Huber <andih@google.com> 1397228093 -0700
committer Mark Salyzyn <salyzyn@google.com> 1397236323 +0000

warnings be gone.

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)

Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.

Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613