am 8099342d: am be4d38e6: Merge "Fix test breakage"

* commit '8099342df30ecfc4808853d65a0e91c0d3ca31a6':
main
Satoshi Kataoka 2013-09-26 05:59:15 -07:00 committed by Android Git Automerger
commit 1017fb2157

Diff Content Not Available