ref: 6f8a77d5d51c5359b6b5606df8aa611e26e3dea4
parent: 6a0dcc1337dc55034a9c417d2b35a73760f46114
parent: 8db1f7ad0c69777d9a0ab7beb6d23508f4377124
author: James Zern <jzern@google.com>
date: Fri May 30 11:09:43 EDT 2014
Merge "Fix unused variable warning."