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

* commit '34055351c461ba79d471419f0bd074f7335515ac':
main
Jean Chalard 2013-10-03 11:43:44 -07:00 committed by Android Git Automerger
commit 5b15924208

Diff Content Not Available