am 36718f2a: Merge "Fix tests running on the server."
authorXavier Ducrohet <xav@android.com>
Thu, 7 Feb 2013 01:00:50 +0000 (17:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Feb 2013 01:00:50 +0000 (17:00 -0800)
commitbbe865d5007f84c8470247341b714a1c57ba363b
tree027bbc2f98aaf693260ce058a958c1040d073cac
parent7ec7e750b8c19d535aadcc571defea8e306eb3f9
parent36718f2a33f8bf0976cd23999a38dc9234fd671f
am 36718f2a: Merge "Fix tests running on the server."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '36718f2a33f8bf0976cd23999a38dc9234fd671f':
  Fix tests running on the server.