Merge remote-tracking branch 'origin/dev/from-android-3.4' into promotion_build
Simone Willett [Tue, 18 Sep 2012 21:35:54 +0000 (14:35 -0700)]

Trivial merge