ref: 69c67c9531b08c1b15985b351677a162739af43e
parent: db4dc6f0c0c30f56d675a489c93b22517eedb9f8
parent: a07bed2b2b2ca84fdb145ee8e4f1ca100d39915e
author: John Koleszar <jkoleszar@google.com>
date: Thu Feb 28 11:25:38 EST 2013
Merge master branch into experimental Picks up some build system changes, compiler warning fixes, etc. Change-Id: I2712f99e653502818a101a72696ad54018152d4e