Merge with upstream experimental changes (2)
authorJohn Koleszar <jkoleszar@google.com>
Wed, 7 Nov 2012 22:32:26 +0000 (14:32 -0800)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 7 Nov 2012 22:32:26 +0000 (14:32 -0800)
commit8959c8b11d11ad44c7bf0cc49e54974e161d374c
tree9fc43cd73c50c016c927eca525f8ef573e86fa52
parent2c08c28191d65bb5a54c78567c2f54960b203f6d
parent5338d983d655664614fffc29142331a928ce018f
Merge with upstream experimental changes (2)

Include upstream changes (variance fixes) into the merged code base.

Change-Id: I4182654c1411c1b15cd23235d3822702613abce1
test/test.mk