ref: 2c08c28191d65bb5a54c78567c2f54960b203f6d
parent: 7b8dfcb5a2cfb01ee7a6009d945d06559b564d06
parent: 0cedaa363187e7fbd42f513e6d1547dc385f38ed
author: John Koleszar <jkoleszar@google.com>
date: Wed Nov 7 05:40:37 EST 2012
Merge with upstream experimental changes Include upstream changes (unit test fixes, in particular) into the merged code base. Change-Id: I096f8a9d09e2532fbec0c95d7a995ab22fa54b29