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

* commit '1017fb215777ff905023bfdc70446556c51ecd1d':
main
Satoshi Kataoka 2013-09-26 07:54:36 -07:00 committed by Android Git Automerger
commit 8048c0ee03

Diff Content Not Available