am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."

* commit 'c840ec9eb7b905f50eee67f9b9d8154a45d2283a':
main
Jean Chalard 2013-04-03 19:36:14 -07:00 committed by Android Git Automerger
commit 310f0dbcb8

Diff Content Not Available