am 3c780b1c: am 47c2296d: am a3441e01: am 6b135deb: am 17fa9f43: am 693832be: am 5b159242: am 34055351: am e4aee5e1: am 68afd659: am 33d4cdcb: Merge "Fix tests for Ia78d3540"

* commit '3c780b1c7f9bb807ba585c5a6e67951a78c255a4':
main
Jean Chalard 2013-10-10 00:49:26 -07:00 committed by Android Git Automerger
commit 8d0e37e327

Diff Content Not Available