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

* commit '491b49b33c15f6a80aad289e00af3172644482eb':
This commit is contained in:
Tadashi G. Takaoka 2013-09-26 06:02:59 -07:00 committed by Android Git Automerger
commit ceaea2c494

Diff content is not available