Merge "Fix failed test case when running framework auto test."
Wink Saville [Thu, 31 Jan 2013 16:11:40 +0000 (16:11 +0000)]

Trivial merge