Merge remote-tracking branch 'origin/dev/from-android-3.4' into promotion_build
authorSimone Willett <swillett@nvidia.com>
Tue, 18 Sep 2012 21:35:54 +0000 (14:35 -0700)
committerSimone Willett <swillett@nvidia.com>
Tue, 18 Sep 2012 21:35:54 +0000 (14:35 -0700)
commit439e9117e1626d54fa9a58826a066450ce0c5f45
treec67c8532aed846d3855272289e6f9ede3e3c445d
parente4a5c87088b7beb773b7e5d3dc27e97d70068f1a
parentba19f9808d65c5c827878dbb2c71ff4cc9fc0f34
Merge remote-tracking branch 'origin/dev/from-android-3.4' into promotion_build