am 5b159242: am 34055351: am e4aee5e1: am 68afd659: am 33d4cdcb: Merge "Fix tests for Ia78d3540"

* commit '5b15924208009ceee5015617bcc80d38d327eacc':
main
Jean Chalard 2013-10-03 14:57:32 -07:00 committed by Android Git Automerger
commit 693832be4c

Diff Content Not Available