am 6ae77cfb: am f4e557c9: am 94af6d9e: Merge "Make unit test independent from test device locale"

* commit '6ae77cfb2d0d746292ee8bc74032bbe276230c91':
main
Tadashi G. Takaoka 2013-09-26 07:03:14 -07:00 committed by Android Git Automerger
commit 88a70d59c2

Diff Content Not Available