am 6943a913: am 5dcd8d72: Merge "Fix failed test case when running framework auto...
Wink Saville [Thu, 31 Jan 2013 16:36:37 +0000 (08:36 -0800)]
# By xiaohui wang
# Via Android Git Automerger (1) and others
* commit '6943a913f8bb044f40f94a933c1e2b24e103f59a':
  Fix failed test case when running framework auto test.


Trivial merge