Merge "Fix tests running on the server."
authorXavier Ducrohet <xav@android.com>
Thu, 7 Feb 2013 00:46:51 +0000 (00:46 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 7 Feb 2013 00:46:54 +0000 (00:46 +0000)
commit36718f2a33f8bf0976cd23999a38dc9234fd671f
tree027bbc2f98aaf693260ce058a958c1040d073cac
parentc3d26c652e7004324569c9384510214981f759b3
parentecfdf7238021c518535e3fb65c46b0e6b48477e1
Merge "Fix tests running on the server."