am 6d2399c0: am 5c057b32: Merge "Fix unit tests."

* commit '6d2399c003264581218913ef48d47732d6eb0a01':
main
Satoshi Kataoka 2013-08-09 02:34:43 -07:00 committed by Android Git Automerger
commit 3cd72a35e0

Diff Content Not Available