am ceaea2c4: am 491b49b3: am ade725ed: Merge "Fix unit test"

* commit 'ceaea2c4949fcc9dae5a0c91e7fff35e2a1d9cd8':
main
Tadashi G. Takaoka 2013-09-26 08:10:26 -07:00 committed by Android Git Automerger
commit be81e89ca8

Diff Content Not Available